Skip to content

T
TangKuPos
Commit 9366fa06 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 6cd9885a b8be77ac
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 29 deletions
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ 9366fa06
......@@ -233,7 +233,20 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 销售订单查询接口
*
* @param pageNulmber
* @param pageSize
* @return
*/
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int
pageSize, String orderStatus, int payType) {
return Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, orderStatus,
payType).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 销售订单查询接口
*
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 9366fa06
......@@ -129,6 +129,10 @@ interface ApiService {
Observable<HttpMessage<Object>> bindCounter(@Query("casherId") long casherId, @Query
("machineNo") String machineNo);
@POST(C.URL.ORDER.getSaleOrder)
Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("orderStatus") String orderStatus, @Query
("payType") int payType);
@POST(C.URL.ORDER.getSaleOrder)
Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java
View file @ 9366fa06
......@@ -10,13 +10,14 @@ import com.xingdata.zzdpos.databinding.ActivityAnnouncementBinding;
import com.xingdata.zzdpos.model.Notice;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.util.OnClickListener;
public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, ActivityAnnouncementBinding> implements AnnouncementContract.View {
private AnnouncementFragment mAnnouncementFragment = new AnnouncementFragment();
LoadingDialog mLoadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
......@@ -41,6 +42,17 @@ public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, Ac
// mAnnouncementDetailFragment.showAnnouncementDetail(s);
// }
@Override
public void isShowLoading(Boolean is) {
if (is) {
mLoadingDialog.show((BaseActivity) mContext);
} else {
if (mLoadingDialog.isShowing) {
mLoadingDialog.dismiss();
}
}
}
@Override
public void loadNotice(Pager<Notice> noticePager, boolean isRefresh) {
mAnnouncementFragment.setData(noticePager, isRefresh);
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementContract.java
View file @ 9366fa06
......@@ -9,7 +9,7 @@ import com.xingdata.zzdpos.model.Pager;
public interface AnnouncementContract {
interface View extends BaseView {
void isShowLoading(Boolean is);
/**
* 加载列表
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementPresenter.java
View file @ 9366fa06
......@@ -14,8 +14,9 @@ public class AnnouncementPresenter extends AnnouncementContract.Presenter {
@Override
public void queryNoticeList() {
mView.isShowLoading(true);
ApiFactory.Notice.queryNotice(nowPageNumber, nowPageSize).doFinally(() -> {
// mView.isShowLoading(false);
mView.isShowLoading(false);
})
.subscribe(noticePager -> {
if (noticePager.getTotalRow() == 0) {
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 9366fa06
......@@ -14,6 +14,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.ActivityMainBinding;
import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
......@@ -39,7 +40,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
// private List<View> views=new ArrayList<>();
private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
private HandoverDialog mHandoverDialog = new HandoverDialog();
LoadingDialog mLoadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.activity_main;
......@@ -136,6 +137,17 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Override
public void isShowLoading(Boolean is) {
if (is) {
mLoadingDialog.show((BaseActivity) mContext);
} else {
if (mLoadingDialog.isShowing) {
mLoadingDialog.dismiss();
}
}
}
@Override
public void handoverOk() {
mHandoverDialog.dismiss();
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
View file @ 9366fa06
......@@ -7,6 +7,8 @@ import com.xingdata.zzdpos.base.BaseView;
interface MainContract {
interface View extends BaseView {
void isShowLoading(Boolean is);
/**
* 交班确认
*/
......@@ -17,6 +19,7 @@ interface MainContract {
// */
// void showChangePasswordDialog();
//
/**
* 显示交班报表页面
*/
......@@ -270,6 +273,7 @@ interface MainContract {
// */
// public abstract void clickChangePassword();
//
/**
* 菜单EXIT页面 - 点击交班 打开交班报表页面
*/
......@@ -507,6 +511,7 @@ interface MainContract {
// */
// public abstract void sync(SplashPresenter.SynchronousTask synchronousTask);
//
/**
* 初始化交班记录
*/
......@@ -527,6 +532,7 @@ interface MainContract {
// */
// public abstract void clickFeedOk(Feed feed);
//
/**
* 注销
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java
View file @ 9366fa06
......@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
......@@ -26,7 +27,7 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
LoadingDialog mLoadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.activity_statistics;
......@@ -60,6 +61,11 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
}
@Override
public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
mStatisticsTitleFragment.searchSuc(saleorderPager, payType);
}
@Override
public void showDateAlert(Boolean f) {
mStatisticsDateFragment.showDateAlert(f);
......@@ -89,6 +95,18 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true);
}
@Override
public void isShowLoading(Boolean is) {
if (is) {
mLoadingDialog.show((BaseActivity) mContext);
} else {
if (mLoadingDialog.isShowing) {
mLoadingDialog.dismiss();
}
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
......@@ -98,4 +116,5 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
// }
return super.onKeyDown(keyCode, event);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ 9366fa06
......@@ -21,6 +21,7 @@ public interface StatisticsContract {
interface View extends BaseView {
void isShowLoading(Boolean is);
/**
* 设置统计信息
*/
......@@ -46,7 +47,10 @@ public interface StatisticsContract {
*/
void searchSuc(Pager<Saleorder> saleorderPager, String wd);
/**
* 搜索成功
*/
void searchSuc(Pager<Saleorder> saleorderPager, int payType);
/**
* 日期搜索成功
*/
......@@ -115,6 +119,10 @@ public interface StatisticsContract {
*/
public abstract void getSaleOrderList(int pageNumber, String wd);
/**
* 搜索订单列表
*/
public abstract void getSaleOrderList(int pageNumber, int payType);
/**
* 搜索日期订单列表
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 9366fa06
package com.xingdata.zzdpos.ui.statistics;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.databinding.DataBindingUtil;
import android.util.TimeUtils;
import android.view.LayoutInflater;
......@@ -20,12 +22,14 @@ import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
LoadingDialog mLoadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
......@@ -40,6 +44,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
finish();
}
});
initData();
}
......@@ -81,7 +86,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
}
private void getVipRechargeOrderSuss(VipRechargeOrder vipRechargeOrder) {
mViewBinding.btnConfirm.setVisibility(View.GONE);
mViewBinding.btnReturn.setVisibility(View.GONE);
mViewBinding.viewVipRecharge.getViewStub().inflate();
ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding.viewVipRecharge.getRoot());
viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay() + vipRechargeOrder.getCardAmtSend(), true));
......@@ -93,6 +98,17 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend(), false));
}
@Override
public void isShowLoading(Boolean is) {
if (is) {
mLoadingDialog.show((BaseActivity) mContext);
} else {
if (mLoadingDialog.isShowing) {
mLoadingDialog.dismiss();
}
}
}
@Override
public void getOrderDetailSuss(Saleorder mSaleorder) {
......@@ -134,7 +150,24 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
viewOrderDetailBinding.llGoodsList.setVisibility(View.VISIBLE);
});
mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消",null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
}
}).create().show();
}
});
}
}
@Override
public void returnOrderSuss() {
finish();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailContract.java
View file @ 9366fa06
......@@ -16,8 +16,9 @@ public interface StatisticsDetailContract {
interface View extends BaseView {
void isShowLoading(Boolean is);
void getOrderDetailSuss(Saleorder saleorder);
void returnOrderSuss();
}
abstract class Presenter extends BasePresenter<View> {
......@@ -27,7 +28,12 @@ public interface StatisticsDetailContract {
* 获取订单明细
*/
public abstract void getOrderDetail(String saleorderId);
/**
* 退货
*
* @param orderId 订单id
*/
public abstract void returnOrder(String orderId);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailPresenter.java
View file @ 9366fa06
......@@ -17,10 +17,23 @@ public class StatisticsDetailPresenter extends StatisticsDetailContract.Presente
@Override
public void getOrderDetail(String mSaleorderId) {
ApiFactory.Test.getSaleOrderDetail(mSaleorderId).subscribe(saleorder -> {
mView.getOrderDetailSuss(saleorder);
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderDetail(mSaleorderId).doFinally(() -> mView.isShowLoading(false))
.subscribe(saleorder -> {
mView.getOrderDetailSuss(saleorder);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void returnOrder(String orderId) {
ApiFactory.Test.returnOrder(orderId ).subscribe(s -> {
ToastUtils.showLong("成功");
mView.returnOrderSuss();
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
ToastUtils.showLong(throwable.getMessage());
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ 9366fa06
......@@ -44,8 +44,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList("99", pageNumber, pageSize, startDate, endDate).doFinally(() -> {
mView.isShowLoading(false);
})
.subscribe(orderlist -> {
fragment.setData(orderlist, orderlist.isFirstPage());
......@@ -73,7 +74,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
mView.isShowLoading(true);
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(()-> mView.isShowLoading(false))
.subscribe(vipRechargeOrderPager -> {
msListFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
}, throwable -> {
......@@ -83,7 +85,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getRechargeList(int pageNumber, long startDate, long endDate) {
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate)
mView.isShowLoading(true);
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
.subscribe(vipRechargeOrderPager -> {
//判断是否能加载更多
if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
......@@ -98,7 +101,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
ApiFactory.Ticket.query(pageNumber, nowPageSize, 1)
mView.isShowLoading(true);
ApiFactory.Ticket.query(pageNumber, nowPageSize, 2).doFinally(()-> mView.isShowLoading(false))
.subscribe(ticketPager -> {
msListFragment.setData(ticketPager, ticketPager.isFirstPage());
}, throwable -> {
......@@ -108,7 +112,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getTicketList(int pageNumber, long startDate, long endDate) {
ApiFactory.Ticket.query(pageNumber, nowPageSize, 1, startDate, endDate)
mView.isShowLoading(true);
ApiFactory.Ticket.query(pageNumber, nowPageSize, 2, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
.subscribe(ticketPager -> {
if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
ToastUtils.showShort("没有查询到相关优惠券");
......@@ -125,7 +130,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
*/
@Override
public void getSaleOrderList(int pageNumber, String wd) {
ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd)
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(()-> mView.isShowLoading(false))
.subscribe(saleorderPager -> {
//判断是否能加载更多
if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
......@@ -140,9 +146,31 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
/**
* 状态，0：已完成，１：退货，7赊账，99：全部订单
*/
@Override
public void getSaleOrderList(int pageNumber, int payType) {
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", payType).doFinally(()-> mView.isShowLoading(false))
.subscribe(saleorderPager -> {
//判断是否能加载更多
if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
ToastUtils.showShort("没有查询到相关订单");
} else {
mView.searchSuc(saleorderPager, payType);
}
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void getSaleOrderList(int pageNumber, long startDate, long endDate) {
ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate)
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(()-> mView.isShowLoading(false))
.subscribe(saleorderPager -> {
//判断是否能加载更多
if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 9366fa06
package com.xingdata.zzdpos.ui.statistics.fragment;
import android.databinding.DataBindingUtil;
import android.view.KeyEvent;
import android.view.View;
......@@ -9,6 +10,7 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentStatisticsTitleBinding;
import com.xingdata.zzdpos.databinding.ViewSearchPaytypeBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket;
......@@ -50,6 +52,34 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
} else {
mViewBinding.viewStub.getViewStub().inflate();
ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
switch (v.getId()) {
case R.id.pay_cash:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
break;
case R.id.pay_alipay:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
break;
case R.id.pay_wechat:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
break;
case R.id.pay_bank:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
break;
case R.id.pay_vipcard:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
break;
case R.id.pay_tally:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
break;
}
}
});
}
} else {
......@@ -95,19 +125,19 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
protected void myOnClickListener(View v) {
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
return ;
return;
}
if (mOrderSearchFragment.isAdded()) {
FragmentUtils.remove(mOrderSearchFragment);
return ;
return;
}
if (mRechargeSearchFragment.isAdded()) {
FragmentUtils.remove(mRechargeSearchFragment);
return ;
return;
}
if (mTicketSearchFragment.isAdded()) {
FragmentUtils.remove(mRechargeSearchFragment);
return ;
return;
}
pop();
}
......@@ -119,8 +149,23 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
fragmentMenu = c;
}
public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
if (!mOrderSearchFragment.isAdded()) {
mOrderSearchFragment.setCreateData(saleorderPager, payType);
FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
} else {
mOrderSearchFragment.setType(OrderSearchFragment.PAYTYPE);
mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
}
}
public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
if (!mOrderSearchFragment.isAdded()) {
mOrderSearchFragment.setCreateData(saleorderPager, wd);
FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
......@@ -132,6 +177,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
}
public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
if (!mOrderSearchFragment.isAdded()) {
mOrderSearchFragment.setCreateData(saleorderPager, start, end);
FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java
View file @ 9366fa06
......@@ -100,7 +100,7 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
@Override
public String getTabTitle() {
return "核销优惠券";
return "已用优惠券";
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderSearchFragment.java
View file @ 9366fa06
......@@ -28,9 +28,11 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
private Pager<Saleorder> saleorders;
private int pagerNum;
private String wd = "";
private int payType;
private int TYPE;
public static final int WD = 99;
public static final int DATE = 100;
public static final int PAYTYPE = 101;
private Long startDate;
private Long endDate;
......@@ -76,6 +78,9 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
case DATE:
mPresenter.getSaleOrderList(pagerNum, startDate, endDate);
break;
case PAYTYPE:
mPresenter.getSaleOrderList(pagerNum, payType);
break;
}
}
......@@ -89,6 +94,9 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
case DATE:
mPresenter.getSaleOrderList(pagerNum, startDate, endDate);
break;
case PAYTYPE:
mPresenter.getSaleOrderList(pagerNum, payType);
break;
}
}
......@@ -112,6 +120,12 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
}
public void setCreateData(Pager<Saleorder> list, int patType) {
this.saleorders = list;
this.payType = patType;
this.TYPE = PAYTYPE;
}
public void setCreateData(Pager<Saleorder> list, String wd) {
this.saleorders = list;
this.wd = wd;
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ 9366fa06
......@@ -69,7 +69,7 @@
tools:targetApi="lollipop" />
<Button
android:id="@+id/btn_confirm"
android:id="@+id/btn_return"
style="@style/button_positive"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
app/src/main/res/layout/fragment_myself.xml
View file @ 9366fa06
......@@ -113,6 +113,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:src="@mipmap/drop_down_fff"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/fragment_statistics_date.xml
View file @ 9366fa06
......@@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_ok"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
......@@ -42,6 +42,7 @@
android:textSize="@dimen/big_text_size" />
<TextView
android:id="@+id/tv_ok"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......
app/src/main/res/layout/view_search_paytype.xml
View file @ 9366fa06
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -14,7 +21,6 @@
android:shrinkColumns="1,2,3">
<TextView
android:id="@+id/tv_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/all_padding"
......@@ -23,32 +29,38 @@
<TableRow>
<ImageView
android:id="@+id/pay_cash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginStart="@dimen/all_padding"
android:layout_weight="1"
android:background="@color/red_diaochan"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_cash" />
<ImageView
android:id="@+id/pay_alipay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_4"
android:layout_weight="1"
android:background="@color/blue_yuefei"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_alipay" />
<ImageView
android:id="@+id/pay_wechat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding"
android:layout_marginStart="@dimen/dp_4"
android:layout_weight="1"
android:background="@color/green_kongrong"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_wechat" />
</TableRow>
......@@ -56,6 +68,7 @@
<TableRow>
<ImageView
android:id="@+id/pay_bank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
......@@ -63,10 +76,12 @@
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/cyan_liubei"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_card" />
<ImageView
android:id="@+id/pay_vipcard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
......@@ -74,10 +89,12 @@
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/yellow_huangxin"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_membershipcard" />
<ImageView
android:id="@+id/pay_tally"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding"
......@@ -85,6 +102,7 @@
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/purple_yanqing"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_padding"
android:src="@mipmap/pay_credit" />
</TableRow>
......
app/src/main/res/values/strings.xml
View file @ 9366fa06
......@@ -613,7 +613,7 @@
<string name="statistics_search_empty">没有查询到订单~</string>
<string name="statistics_search_empty_recharge">没有查询到充值记录~</string>
<string name="statistics_search_empty_ticket">没有查询到相关优惠券~</string>
<string name="statistics_order_edit_hint">请输入单号</string>
<string name="statistics_order_edit_hint">请输入单号/手机号</string>
<string name="statistics_order_detail_hint">订单详情</string>
<string name="statistics_vip_recharge_hint">充值记录</string>
<string name="statistics_used_ticket_hint">充值记录</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment