Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -583,12 +583,17 @@ public final class ApiFactory {
         }
 
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size,int usedFlag) {
-            return Api.getInstance().service.queryTicket(num, size,usedFlag).
+        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size, int usedFlag) {
+            return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList").
                     onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
         }
 
+        public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int size, int usedFlag, long startDate, long endDate) {
+            return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList", startDate, endDate).
+                    onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+        }
 
         public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
                 vipId, Long truleId) {
@@ -748,6 +753,18 @@ public final class ApiFactory {
     }
 
     public static class Rctrace {
+        /**
+         * 查询充值记录
+         */
+        public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize, long startDate,
+                                                                        long endDate) {
+            return Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate, endDate)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+        }
+
         /**
          * 查询充值记录
          */

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -188,6 +188,11 @@ interface ApiService {
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize);
 
+    @POST(C.URL.RCTRACE.query)
+    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
+            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
+                                                                           endDate);
+
     @POST(C.URL.PSB.queryDetail)
     Observable<HttpMessage<Psb>> queryPsbDetail(@Query("psbNo") String psbNo, @Query("id") long id);
 
@@ -212,7 +217,12 @@ interface ApiService {
 
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
-            ("pageSize") int pageSize,@Query("usedFlag") int usedFlag);
+            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList);
+
+    @POST(C.URL.TICKET.query)
+    Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
+            ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
+                                                               endDate);
 
     @POST(C.URL.TICKET.ticketBatchSend)
     Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,

app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java

@@ -10,6 +10,8 @@ import com.xingdata.zzdpos.base.BaseDialog;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
 
+import java.util.ArrayList;
+
 public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
     //    Disposable disp;
     boolean isClose = true;

app/src/main/java/com/xingdata/zzdpos/ui/help/HelpActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.ActivityHelpBinding;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.SystemUtil;
 
 public class HelpActivity extends AppCompatActivity {
     private ActivityHelpBinding mHelpBinding;
@@ -19,6 +20,7 @@ public class HelpActivity extends AppCompatActivity {
         View root = LayoutInflater.from(this).inflate(R.layout.activity_help, null);
         setContentView(root);
         mHelpBinding = DataBindingUtil.bind(root);
+        mHelpBinding.setVersionNo(SystemUtil.getVersionName());
         mHelpBinding.icTitle.tvTitle.setText(R.string.help_hint);
         mHelpBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java

@@ -893,44 +893,7 @@ public class MainPresenter extends MainContract.Presenter {
         }
     }
 
-//    /**
-//     * 更新交班信息
-//     */
-//    private void updateHandover() {
-//        getRealm().beginTransaction();
-//        handoverInfo.setSumOrder(handoverInfo.getSumOrder() + 1);
-//        switch (mPayType) {
-//            case C.PAY_CHANNEL.CASH:
-//                handoverInfo.setCash(handoverInfo.getCash() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.WECHAT:
-//                handoverInfo.setWechat(handoverInfo.getWechat() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.ALI:
-//                handoverInfo.setAlipay(handoverInfo.getAlipay() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.BANK:
-//                handoverInfo.setPos(handoverInfo.getPos() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.CARD:
-//                handoverInfo.setVip(handoverInfo.getVip() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.TALLY:
-//                break;
-//        }
-//        getRealm().copyToRealmOrUpdate(handoverInfo);
-//        getRealm().commitTransaction();
-//    }
+
 
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -16,6 +16,7 @@ import com.xingdata.zzdpos.databinding.FragmentMyselfBinding;
 import com.xingdata.zzdpos.ui.announcement.AnnouncementActivity;
 import com.xingdata.zzdpos.ui.feedback.FeedBackActivity;
 import com.xingdata.zzdpos.ui.help.HelpActivity;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import com.xingdata.zzdpos.ui.main.adapter.MySelfRecyclerAdapter;
@@ -35,7 +36,9 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
 
     @Override
     public void initView() {
-
+        mViewBinding.setOpername(LoginPresenter.loginReturnBean.getOperName());
+//        mViewBinding.setPhone(LoginPresenter.loginReturnBean.getOperMobile()+"");
+        mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName()+LoginPresenter.loginReturnBean.getCityCountyName()+LoginPresenter.loginReturnBean.getCityAddress());
         mViewBinding.fragmentMyselfRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
         integers = new ArrayList<>();
         integers.add(107);

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -5,11 +5,13 @@ import com.blankj.utilcode.util.StringUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
+import com.xingdata.zzdpos.model.HandoverInfo;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +20,10 @@ import io.reactivex.Observable;
 
 public class SettlePresenter extends SettleContract.Presenter {
 
+    /**
+     * 当前的使用的支付方式
+     */
+    private int mPayType;
     /**
      * 结算模式
      */
@@ -214,23 +220,28 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInCash(Long inputAmt, Long changeAmt) {
+        this.mPayType = C.PAY_CHANNEL.CASH;
         subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CASH))));
     }
 
     @Override
     public void payInAli(String payCode) {
+        this.mPayType = C.PAY_CHANNEL.ALI;
     }
 
     @Override
     public void payInWechat(String payCode) {
+        this.mPayType = C.PAY_CHANNEL.WECHAT;
     }
 
     @Override
     public void payInBank() {
+        this.mPayType = C.PAY_CHANNEL.BANK;
     }
 
     @Override
     public void payInCard(Long cardNo, String password) {
+        this.mPayType = C.PAY_CHANNEL.CARD;
         ApiFactory.Recard.checkPwd(mVip.getVipId(), String.valueOf(cardNo), password).subscribe(
                 b -> {
                     mView.dismissPasswordDialog();
@@ -242,6 +253,7 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInTally() {
+        this.mPayType = C.PAY_CHANNEL.TALLY;
     }
 
     @Override
@@ -299,6 +311,7 @@ public class SettlePresenter extends SettleContract.Presenter {
      */
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
+        this.updateHandover(MainPresenter.handoverInfo);
     }
 
     /**
@@ -368,5 +381,42 @@ public class SettlePresenter extends SettleContract.Presenter {
         mSaleorder.settle();
         mView.loadSaleorder(mSaleorder);
     }
-
+    /**
+     * 更新交班信息
+     */
+    private void updateHandover(HandoverInfo handoverInfo) {
+        getRealm().beginTransaction();
+        handoverInfo.setSumOrder(handoverInfo.getSumOrder() + 1);
+        switch (mPayType) {
+            case C.PAY_CHANNEL.CASH:
+                handoverInfo.setCash(handoverInfo.getCash() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.WECHAT:
+                handoverInfo.setWechat(handoverInfo.getWechat() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.ALI:
+                handoverInfo.setAlipay(handoverInfo.getAlipay() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.BANK:
+                handoverInfo.setPos(handoverInfo.getPos() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.CARD:
+                handoverInfo.setVip(handoverInfo.getVip() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.TALLY:
+                break;
+        }
+        getRealm().copyToRealmOrUpdate(handoverInfo);
+        getRealm().commitTransaction();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java

@@ -15,6 +15,8 @@ import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
 import com.xingdata.zzdpos.model.Pager;
 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.statistics.fragment.StatisticsDateFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
@@ -59,7 +61,31 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
     }
 
     @Override
-    public void showDateFragment() {
+    public void showDateAlert(Boolean f) {
+        mStatisticsDateFragment.showDateAlert(f);
+    }
+
+    @Override
+    public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
+        mStatisticsDateFragment.pop();
+        mStatisticsTitleFragment.searchSuc(saleorderPager, start,end);
+    }
+
+    @Override
+    public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) {
+        mStatisticsDateFragment.pop();
+        mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start,end);
+    }
+
+    @Override
+    public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
+        mStatisticsDateFragment.pop();
+        mStatisticsTitleFragment.searchTicketSuc(ticketPager, start,end);
+    }
+
+    @Override
+    public void showDateFragment(Integer integer) {
+        mStatisticsDateFragment.setSearchType(integer);
         FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java

 package com.xingdata.zzdpos.ui.statistics;
 
+import android.content.Intent;
+
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Pager;
 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.statistics.fragment.ms.UsedTicketListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
@@ -30,7 +34,7 @@ public interface StatisticsContract {
         /**
          * 跳转日期搜索
          */
-        void showDateFragment();
+        void showDateFragment(Integer integer);
 
         /**
          * 跳转营销页
@@ -43,13 +47,33 @@ public interface StatisticsContract {
         void searchSuc(Pager<Saleorder> saleorderPager, String wd);
 
 
+        /**
+         * 日期搜索成功
+         */
+        void searchSuc(Pager<Saleorder> saleorderPager, long start, long end);
+
+        /**
+         * 日期搜索成功
+         */
+        void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end);
+
+        /**
+         * 日期搜索成功
+         */
+        void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end);
+        /**
+         * 展示日期警告
+         */
+        void showDateAlert(Boolean f);
+
     }
 
     abstract class Presenter extends BasePresenter<View> {
         /**
          * 跳转日期搜索
          */
-        public abstract void clickDate();
+        public abstract void clickDate(Integer integer);
+
         /**
          * 跳转营销页
          */
@@ -65,11 +89,22 @@ public interface StatisticsContract {
          */
         public abstract void getRechargeList(int pageNumber, RechargeListFragment msListFragment);
 
+
         /**
-         * 获取已发优惠券列表
+         * 获取充值列表
+         */
+        public abstract void getRechargeList(int pageNumber, long startDate, long endDate);
+
+
+        /**
+         * 获取已用优惠券列表
          */
         public abstract void getTicketList(int pageNumber, UsedTicketListFragment msListFragment);
 
+        /**
+         * 获取已用优惠券列表
+         */
+        public abstract void getTicketList(int pageNumber,long startDate, long endDate);
         /**
          * 获取订单列表
          */
@@ -78,11 +113,24 @@ public interface StatisticsContract {
         /**
          * 搜索订单列表
          */
-        public abstract void getSaleOrderList(String orderNo, int pageNumber, String wd);
+        public abstract void getSaleOrderList(int pageNumber, String wd);
+
+        /**
+         * 搜索日期订单列表
+         */
+        public abstract void getSaleOrderList(int pageNumber, long startDate, long endDate);
 
         /**
          * 获取统计详情
          */
         public abstract void getSat();
+
+        /**
+         * 检查日期合法性
+         *
+         * @param dateStart 起始时间
+         * @param dateEnd   终止时间
+         */
+        public abstract void inspectDate(String dateStart, String dateEnd, Integer type);
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

 package com.xingdata.zzdpos.ui.statistics;
 
 
+import android.content.Intent;
+
+import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
+import com.xingdata.zzdpos.util.StringUtil;
+
+import java.text.SimpleDateFormat;
 
 /**
  * Created by Administrator on 2017/12/23.
@@ -21,8 +27,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     }
 
     @Override
-    public void clickDate() {
-        mView.showDateFragment();
+    public void clickDate(Integer integer) {
+        mView.showDateFragment(integer);
     }
 
     @Override
@@ -75,6 +81,21 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
                 });
     }
 
+    @Override
+    public void getRechargeList(int pageNumber, long startDate, long endDate) {
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate)
+                .subscribe(vipRechargeOrderPager -> {
+                    //判断是否能加载更多
+                    if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
+                        ToastUtils.showShort("没有查询到相关充值记录");
+                    } else {
+                        mView.searchRechargeSuc(vipRechargeOrderPager, startDate, endDate);
+                    }
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
     @Override
     public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
         ApiFactory.Ticket.query(pageNumber, nowPageSize, 1)
@@ -85,14 +106,26 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
                 });
     }
 
+    @Override
+    public void getTicketList(int pageNumber, long startDate, long endDate) {
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, 1, startDate, endDate)
+                .subscribe(ticketPager -> {
+                    if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
+                        ToastUtils.showShort("没有查询到相关优惠券");
+                    } else {
+                        mView.searchTicketSuc(ticketPager, startDate, endDate);
+                    }
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
     /**
      * 状态，0：已完成，１：退货，7赊账，99：全部订单
-     *
-     * @param orderNo 订单号
      */
     @Override
-    public void getSaleOrderList(String orderNo, int pageNumber, String wd) {
-        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", orderNo, wd)
+    public void getSaleOrderList(int pageNumber, String wd) {
+        ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd)
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
                     if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
@@ -107,4 +140,47 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     }
 
+    @Override
+    public void getSaleOrderList(int pageNumber, long startDate, long endDate) {
+        ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate)
+                .subscribe(saleorderPager -> {
+                    //判断是否能加载更多
+                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+                        ToastUtils.showShort("没有查询到相关订单");
+                    } else {
+                        mView.searchSuc(saleorderPager, startDate, endDate);
+                    }
+
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void inspectDate(String dateStart, String dateEnd, Integer type) {
+        long longStart = TimeUtils.string2Millis(dateStart, new SimpleDateFormat(StringUtil.defaultDatePattern));
+        long longEnd = TimeUtils.string2Millis(dateEnd, new SimpleDateFormat(StringUtil.defaultDatePattern)) + 86400000L;
+        if (longStart > longEnd) {
+            ToastUtils.showShort("日期不符合区间");
+            mView.showDateAlert(true);
+        } else {
+            mView.showDateAlert(false);
+            if (type == null) {
+                getSaleOrderList(1, longStart, longEnd);
+            } else {
+                switch (type) {
+                    case 0:
+                        getRechargeList(1, longStart, longEnd);
+                        break;
+                    case 1:
+                        getTicketList(1, longStart, longEnd);
+                        break;
+
+                }
+            }
+
+
+        }
+
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsRechargeAdapter.java

@@ -26,6 +26,7 @@ public class StatisticsRechargeAdapter extends BaseAdapter<VipRechargeOrder, Ite
 
     @Override
     protected void convert(ItemStatisticsBinding mViewBinding, VipRechargeOrder item) {
+        mViewBinding.imgLeft.setImageResource(R.mipmap.ic_text_recharge);
         mViewBinding.tvLeftTop.setText(item.getUserName());
         mViewBinding.tvLeftBottom.setText(com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime()));
         mViewBinding.tvRightTop.setText("+"+ ConvertUtil.fenToYuan(item.getCardAmtPay(),false));

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsTicketAdapter.java

@@ -27,6 +27,7 @@ public class StatisticsTicketAdapter extends BaseAdapter<Ticket, ItemStatisticsB
 
     @Override
     protected void convert(ItemStatisticsBinding mViewBinding, Ticket item) {
+        mViewBinding.imgLeft.setImageResource(R.mipmap.ic_text_ticket);
         mViewBinding.tvLeftTop.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元优惠券");
         mViewBinding.tvLeftBottom.setText(TimeUtils.date2String(item.getCreateTime()));
     }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsDateFragment.java

@@ -24,12 +24,15 @@ import com.xingdata.zzdpos.util.OnClickListener;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.text.SimpleDateFormat;
+import java.util.logging.Handler;
 
 
 public class StatisticsDateFragment extends BaseFragment<StatisticsPresenter, FragmentStatisticsDateBinding> {
     private float textSize;
     private View.OnFocusChangeListener mOnFocusChangeListener;
     private View.OnClickListener mOnClickListener;
+    private Integer type;
+
 
     @Override
     public int getLayoutId() {
@@ -46,39 +49,61 @@ public class StatisticsDateFragment extends BaseFragment<StatisticsPresenter, Fr
         mViewBinding.editStart.setOnClickListener(mOnClickListener);
         mViewBinding.editEnd.setOnClickListener(mOnClickListener);
 
-
-        mViewBinding.editStart.setText(StringUtil.monthStart());
-        mViewBinding.editEnd.setText(TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern)));
-        String[] strings = mViewBinding.editStart.getText().toString().split("-");
-        mViewBinding.datePicker.setMaxDate(System.currentTimeMillis());
-        mViewBinding.datePicker.init(Integer.valueOf(strings[0]), Integer.valueOf(strings[1]) - 1, Integer.valueOf(strings[2]), new DatePicker.OnDateChangedListener() {
+        String startAll = StringUtil.monthStart();
+        String[] stringsStart = startAll.split("-");
+        mViewBinding.datePickerStart.setMaxDate(System.currentTimeMillis());
+        mViewBinding.datePickerStart.init(2000, 0, 0, new DatePicker.OnDateChangedListener() {
             @Override
             public void onDateChanged(DatePicker datePicker, int i, int i1, int i2) {
                 String month = String.valueOf(i1 + 1).length() >= 2 ? String.valueOf(i1 + 1) : "0" + String.valueOf(i1 + 1);
                 String day = String.valueOf(i2).length() >= 2 ? String.valueOf(i2) : "0" + String.valueOf(i2);
-                if (mViewBinding.editStart.isFocused()) {
                 mViewBinding.editStart.setText(i + "-" + month + "-" + day);
-                } else if (mViewBinding.editEnd.isFocused()) {
+            }
+        });
+        String endAll = TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern));
+        String[] stringsEnd = endAll.split("-");
+        mViewBinding.datePickerEnd.setMaxDate(System.currentTimeMillis());
+        mViewBinding.datePickerEnd.init(2000, 0, 0, new DatePicker.OnDateChangedListener() {
+            @Override
+            public void onDateChanged(DatePicker datePicker, int i, int i1, int i2) {
+                String month = String.valueOf(i1 + 1).length() >= 2 ? String.valueOf(i1 + 1) : "0" + String.valueOf(i1 + 1);
+                String day = String.valueOf(i2).length() >= 2 ? String.valueOf(i2) : "0" + String.valueOf(i2);
                 mViewBinding.editEnd.setText(i + "-" + month + "-" + day);
             }
+        });
+        mViewBinding.tvOk.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.inspectDate(mViewBinding.editStart.getText().toString(), mViewBinding.editEnd.getText().toString(), type);
+            }
+        });
 
+        mViewBinding.tvCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                pop();
             }
         });
 
-//        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
-//            @Override
-//            protected void myOnClickListener(View v) {
-//                if (mViewBinding.icTitle.edTitle.isFocused()) {
-//                    mViewBinding.icTitle.edTitle.clearFocus();
-//                    return;
-//                }
-//                if (mOrderSearchFragment.isAdded()) {
-//                    FragmentUtils.remove(mOrderSearchFragment);
-//                    return;
-//                }
-//                pop();
-//            }
-//        });
+
+        new android.os.Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mViewBinding.datePickerStart.updateDate(Integer.valueOf(stringsStart[0]), Integer.valueOf(stringsStart[1]) - 1, Integer.valueOf(stringsStart[2]));
+                mViewBinding.datePickerEnd.updateDate(Integer.valueOf(stringsEnd[0]), Integer.valueOf(stringsEnd[1]) - 1, Integer.valueOf(stringsEnd[2]));
+                mViewBinding.editStart.performClick();
+                mViewBinding.editStart.setText(startAll);
+                mViewBinding.editEnd.setText(endAll);
+            }
+        }, 10);
+    }
+
+    public void showDateAlert(Boolean f) {
+        if (f) {
+            mViewBinding.imgAlert.setVisibility(View.VISIBLE);
+        } else {
+            mViewBinding.imgAlert.setVisibility(View.GONE);
+        }
     }
 
     private void initListener() {
@@ -89,7 +114,13 @@ public class StatisticsDateFragment extends BaseFragment<StatisticsPresenter, Fr
                     ((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize + 5);
                     ((TextView) view).setTextColor(getResources().getColor(R.color.red_guanyu));
                     String[] strings = ((TextView) view).getText().toString().split("-");
-                    mViewBinding.datePicker.updateDate(Integer.valueOf(strings[0]), Integer.valueOf(strings[1]), Integer.valueOf(strings[2]));
+                    if (mViewBinding.datePickerStart.getVisibility() == View.GONE) {
+                        mViewBinding.datePickerStart.setVisibility(View.VISIBLE);
+                        mViewBinding.datePickerEnd.setVisibility(View.GONE);
+                    } else {
+                        mViewBinding.datePickerStart.setVisibility(View.GONE);
+                        mViewBinding.datePickerEnd.setVisibility(View.VISIBLE);
+                    }
                 } else {
                     ((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
                     ((TextView) view).setTextColor(getResources().getColor(R.color.gray_kongming));
@@ -109,4 +140,8 @@ public class StatisticsDateFragment extends BaseFragment<StatisticsPresenter, Fr
             }
         };
     }
+
+    public void setSearchType(Integer integer) {
+        this.type = integer;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java

@@ -11,8 +11,12 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentStatisticsTitleBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Ticket;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.MsMainFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeSearchFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.ms.TicketSearchFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderMainFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderSearchFragment;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -22,6 +26,8 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
     private int fragmentMenu;
     private OrderMainFragment mOrderMainFragment = new OrderMainFragment();
     private OrderSearchFragment mOrderSearchFragment = new OrderSearchFragment();
+    private RechargeSearchFragment mRechargeSearchFragment = new RechargeSearchFragment();
+    private TicketSearchFragment mTicketSearchFragment = new TicketSearchFragment();
     private MsMainFragment mMsMainFragment = new MsMainFragment();
 
     @Override
@@ -53,7 +59,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 });
                 mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
                     if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-                        mPresenter.getSaleOrderList(null, 1, mViewBinding.icTitle.edTitle.getText().toString());
+                        mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
                         hideSoftInput();
                     }
 
@@ -62,7 +68,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
                     @Override
                     protected void myOnClickListener(View v) {
-                     mPresenter.clickDate();
+                        mPresenter.clickDate(null);
                     }
                 });
 
@@ -73,6 +79,13 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
                 mViewBinding.icTitle.tvTitle.setText(R.string.menu_ms);
                 mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
+
+                mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
+                    @Override
+                    protected void myOnClickListener(View v) {
+                        mPresenter.clickDate(mMsMainFragment.getTabItem());
+                    }
+                });
                 break;
         }
 
@@ -82,11 +95,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 ;
+                }
+                if (mTicketSearchFragment.isAdded()) {
+                    FragmentUtils.remove(mRechargeSearchFragment);
+                    return ;
                 }
                 pop();
             }
@@ -101,12 +122,44 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
     public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
         if (!mOrderSearchFragment.isAdded()) {
-            mOrderSearchFragment.setCreateDate(saleorderPager, wd);
+            mOrderSearchFragment.setCreateData(saleorderPager, wd);
+            FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
+        } else {
+            mOrderSearchFragment.setType(OrderSearchFragment.WD);
+            mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
+        }
+
+    }
+
+    public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
+        if (!mOrderSearchFragment.isAdded()) {
+            mOrderSearchFragment.setCreateData(saleorderPager, start, end);
             FragmentUtils.add(getChildFragmentManager(), mOrderSearchFragment, mViewBinding.mainFrame.getId(), false, true);
         } else {
+            mOrderSearchFragment.setType(OrderSearchFragment.DATE);
             mOrderSearchFragment.setData(saleorderPager, saleorderPager.isFirstPage());
         }
+    }
+
+
+    public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) {
+        if (!mRechargeSearchFragment.isAdded()) {
+            mRechargeSearchFragment.setCreateData(vipRechargeOrderPager, start, end);
+            FragmentUtils.add(getChildFragmentManager(), mRechargeSearchFragment, mViewBinding.mainFrame.getId(), false, true);
+        } else {
+            mRechargeSearchFragment.setType(OrderSearchFragment.DATE);
+            mRechargeSearchFragment.setData(vipRechargeOrderPager, vipRechargeOrderPager.isFirstPage());
+        }
+    }
 
+    public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
+        if (!mTicketSearchFragment.isAdded()) {
+            mTicketSearchFragment.setCreateData(ticketPager, start, end);
+            FragmentUtils.add(getChildFragmentManager(), mTicketSearchFragment, mViewBinding.mainFrame.getId(), false, true);
+        } else {
+            mTicketSearchFragment.setType(OrderSearchFragment.DATE);
+            mTicketSearchFragment.setData(ticketPager, ticketPager.isFirstPage());
+        }
     }
 
     @Override
@@ -119,6 +172,14 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.remove(mOrderSearchFragment);
             return true;
         }
+        if (mRechargeSearchFragment.isAdded()) {
+            FragmentUtils.remove(mRechargeSearchFragment);
+            return true;
+        }
+        if (mTicketSearchFragment.isAdded()) {
+            FragmentUtils.remove(mRechargeSearchFragment);
+            return true;
+        }
         mViewBinding.icTitle.edTitle.setText("");
         return false;
 

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/MsMainFragment.java

@@ -58,5 +58,7 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
 
         }
     }
-
+    public int getTabItem() {
+        return mViewBinding.tabLayout.getSelectedTabPosition();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeSearchFragment.java

+package com.xingdata.zzdpos.ui.statistics.fragment.ms;
+
+
+import android.content.Intent;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
+import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
+
+import java.util.ArrayList;
+
+
+public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
+    private StatisticsRechargeAdapter mStatisticsAdapter;
+    private Pager<VipRechargeOrder> VipRechargeOrders;
+    private int pagerNum;
+    private String wd = "";
+    private int TYPE;
+    public static final int WD = 99;
+    public static final int DATE = 100;
+    private Long startDate;
+    private Long endDate;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_order_search;
+    }
+
+    @Override
+    public void initView() {
+
+        if (mStatisticsAdapter == null) {
+            mStatisticsAdapter = new StatisticsRechargeAdapter(new ArrayList<>());
+            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
+        } else {
+            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
+        }
+        mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
+        mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
+        if (VipRechargeOrders != null) {
+            setData(VipRechargeOrders, VipRechargeOrders.isFirstPage());
+        }
+        mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
+                intent.putExtra(VipRechargeOrder.class.getName(), mStatisticsAdapter.getData().get(position));
+                ActivityUtils.startActivity(intent);
+            }
+        });
+
+    }
+
+    private void onRefresh() {
+        pagerNum = 1;
+        switch (TYPE) {
+            case WD:
+//                mPresenter.getVipRechargeOrderList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getRechargeList(pagerNum, startDate, endDate);
+                break;
+        }
+
+    }
+
+    private void onLoadMore() {
+        pagerNum++;
+        switch (TYPE) {
+            case WD:
+//                mPresenter.getVipRechargeOrderList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getRechargeList(pagerNum, startDate, endDate);
+                break;
+        }
+    }
+
+
+    /**
+     * 设置数据
+     *
+     * @param pager     数据
+     * @param isRefresh 是否刷新
+     */
+    public void setData(Pager<VipRechargeOrder> pager, boolean isRefresh) {
+        if (isRefresh) {
+            mStatisticsAdapter.setEnableLoadMore(true);
+            mViewBinding.srlProduct.setRefreshing(false);
+            pagerNum = 1;
+        }
+        if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
+        else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
+        if (pager.isLastPage()) mStatisticsAdapter.loadMoreEnd(isRefresh);
+        else mStatisticsAdapter.loadMoreComplete();
+
+    }
+
+    public void setCreateData(Pager<VipRechargeOrder> list, String wd) {
+        this.VipRechargeOrders = list;
+        this.wd = wd;
+        this.TYPE = WD;
+    }
+
+    public void setCreateData(Pager<VipRechargeOrder> list, long start, long end) {
+        this.VipRechargeOrders = list;
+        this.startDate = start;
+        this.endDate = end;
+        this.TYPE = DATE;
+    }
+
+    public void setType(int t) {
+        this.TYPE = t;
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/TicketSearchFragment.java

+package com.xingdata.zzdpos.ui.statistics.fragment.ms;
+
+
+import android.content.Intent;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Ticket;
+import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
+import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
+
+import java.util.ArrayList;
+
+
+public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
+    private StatisticsTicketAdapter mStatisticsAdapter;
+    private Pager<Ticket> Tickets;
+    private int pagerNum;
+    private String wd = "";
+    private int TYPE;
+    public static final int WD = 99;
+    public static final int DATE = 100;
+    private Long startDate;
+    private Long endDate;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_order_search;
+    }
+
+    @Override
+    public void initView() {
+
+        if (mStatisticsAdapter == null) {
+            mStatisticsAdapter = new StatisticsTicketAdapter(new ArrayList<>());
+            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
+        } else {
+            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
+        }
+        mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
+        mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
+        if (Tickets != null) {
+            setData(Tickets, Tickets.isFirstPage());
+        }
+        mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
+                intent.putExtra(Ticket.class.getName(), mStatisticsAdapter.getData().get(position));
+                ActivityUtils.startActivity(intent);
+            }
+        });
+
+
+    }
+
+    private void onRefresh() {
+        pagerNum = 1;
+        switch (TYPE) {
+            case WD:
+//                mPresenter.getTicketList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getRechargeList(pagerNum, startDate, endDate);
+                break;
+        }
+
+    }
+
+    private void onLoadMore() {
+        pagerNum++;
+        switch (TYPE) {
+            case WD:
+//                mPresenter.getTicketList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getRechargeList(pagerNum, startDate, endDate);
+                break;
+        }
+    }
+
+
+    /**
+     * 设置数据
+     *
+     * @param pager     数据
+     * @param isRefresh 是否刷新
+     */
+    public void setData(Pager<Ticket> pager, boolean isRefresh) {
+        if (isRefresh) {
+            mStatisticsAdapter.setEnableLoadMore(true);
+            mViewBinding.srlProduct.setRefreshing(false);
+            pagerNum = 1;
+        }
+        if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
+        else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
+        if (pager.isLastPage()) mStatisticsAdapter.loadMoreEnd(isRefresh);
+        else mStatisticsAdapter.loadMoreComplete();
+
+    }
+
+    public void setCreateData(Pager<Ticket> list, String wd) {
+        this.Tickets = list;
+        this.wd = wd;
+        this.TYPE = WD;
+    }
+
+    public void setCreateData(Pager<Ticket> list, long start, long end) {
+        this.Tickets = list;
+        this.startDate = start;
+        this.endDate = end;
+        this.TYPE = DATE;
+    }
+
+    public void setType(int t) {
+        this.TYPE = t;
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java

 package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
+import android.content.Intent;
 import android.support.v4.app.Fragment;
 
 import com.blankj.utilcode.util.TimeUtils;
@@ -135,4 +136,6 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
         }
     }
 
+
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderSearchFragment.java

 package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
+import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 
@@ -10,6 +14,7 @@ import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
 
+import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
 
@@ -21,8 +26,13 @@ import java.util.List;
 public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, FragmentOrderSearchBinding> {
     private StatisticsOrderAdapter mStatisticsAdapter;
     private Pager<Saleorder> saleorders;
-    private int pagerNum = 1;
+    private int pagerNum;
     private String wd = "";
+    private int TYPE;
+    public static final int WD = 99;
+    public static final int DATE = 100;
+    private Long startDate;
+    private Long endDate;
 
 
     @Override
@@ -46,18 +56,40 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
         if (saleorders != null) {
             setData(saleorders, saleorders.isFirstPage());
         }
-
+        mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
+                intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
+                ActivityUtils.startActivity(intent);
+            }
+        });
 
     }
 
     private void onRefresh() {
         pagerNum = 1;
-        mPresenter.getSaleOrderList(null, pagerNum, wd);
+        switch (TYPE) {
+            case WD:
+                mPresenter.getSaleOrderList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getSaleOrderList(pagerNum, startDate, endDate);
+                break;
+        }
+
     }
 
     private void onLoadMore() {
         pagerNum++;
-        mPresenter.getSaleOrderList(null, pagerNum, wd);
+        switch (TYPE) {
+            case WD:
+                mPresenter.getSaleOrderList(pagerNum, wd);
+                break;
+            case DATE:
+                mPresenter.getSaleOrderList(pagerNum, startDate, endDate);
+                break;
+        }
     }
 
 
@@ -71,6 +103,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
         if (isRefresh) {
             mStatisticsAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);
+            pagerNum = 1;
         }
         if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
         else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
@@ -79,10 +112,21 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
 
     }
 
-    public void setCreateDate(Pager<Saleorder> list, String wd) {
+    public void setCreateData(Pager<Saleorder> list, String wd) {
         this.saleorders = list;
         this.wd = wd;
+        this.TYPE = WD;
     }
 
+    public void setCreateData(Pager<Saleorder> list, long start, long end) {
+        this.saleorders = list;
+        this.startDate = start;
+        this.endDate = end;
+        this.TYPE = DATE;
+    }
+
+    public void setType(int t) {
+        this.TYPE = t;
+    }
 
 }

app/src/main/res/drawable/ic_alert.xml

+<vector android:height="24dp" android:viewportHeight="1000.0"
+    android:viewportWidth="1000.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#d81e06" android:pathData="M516.7,10.3c-265.9,0 -481.5,215.6 -481.5,481.5 0,265.9 215.6,481.5 481.5,481.5 265.9,0 481.5,-215.6 481.5,-481.5 0,-265.9 -215.6,-481.5 -481.5,-481.5zM570.1,759.2h-107v-107h107v107zM570.1,598.7h-107v-428h107v428z"/>
+</vector>

app/src/main/res/layout/activity_login.xml

@@ -34,7 +34,6 @@
 
         <FrameLayout
             android:id="@+id/fra"
-            style="@style/xuline_margin"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_gravity="center"

app/src/main/res/layout/activity_main.xml

@@ -18,6 +18,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:orientation="horizontal"
             android:paddingTop="@dimen/all_padding"
+            app:tabIndicatorHeight="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:tabGravity="fill"
             app:tabSelectedTextColor="@color/red_guanyu"

app/src/main/res/layout/fragment_myself.xml

 <layout>
 
+    <data>
+
+        <variable
+            name="opername"
+            type="String" />
+
+        <variable
+            name="phone"
+            type="String" />
+
+        <variable
+            name="address"
+            type="String" />
+    </data>
+
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -58,7 +73,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="李小乐"
+                        android:text="@{opername}"
                         android:textColor="@color/white_caocao"
                         android:textSize="@dimen/big_text_size" />
 
@@ -66,7 +81,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/all_padding"
-                        android:text="18710251009"
+                        android:text="@{phone}"
                         android:textColor="@color/white_caocao"
                         android:textSize="@dimen/small_text_size" />
                 </LinearLayout>
@@ -81,7 +96,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="北京市丰台区南四环西路186号"
+                        android:text="@{address}"
                         android:textColor="@color/white_caocao"
                         android:textSize="@dimen/small_text_size" />
 

app/src/main/res/layout/fragment_statistics_date.xml

@@ -20,9 +20,10 @@
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="@dimen/view_line_L2">
+           >
 
             <TextView
+                android:id="@+id/tv_cancel"
                 style="@style/textView_body"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -32,6 +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"
@@ -47,6 +49,11 @@
                 android:text="完成"
                 android:textColor="@color/red_guanyu"
                 app:layout_constraintEnd_toEndOf="parent" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/view_line_L1"
+                android:background="@color/gray_zhouyu"
+                app:layout_constraintBottom_toBottomOf="parent"/>
         </android.support.constraint.ConstraintLayout>
 
         <TextView
@@ -55,8 +62,6 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/all_padding"
             android:gravity="center"
-            android:paddingBottom="@dimen/all_padding"
-            android:paddingTop="@dimen/all_padding"
             android:text="至"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -89,7 +94,21 @@
             app:layout_constraintTop_toTopOf="@id/tv_center" />
 
         <DatePicker
-            android:id="@+id/date_picker"
+            android:id="@+id/date_picker_start"
+            style="@android:style/Theme.Holo.Light.NoActionBar.TranslucentDecor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_margin_big"
+            android:calendarViewShown="false"
+            android:datePickerMode="spinner"
+            android:spinnersShown="true"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="@id/tv_center">
+
+        </DatePicker>
+
+        <DatePicker
+            android:id="@+id/date_picker_end"
             style="@android:style/Theme.Holo.Light.NoActionBar.TranslucentDecor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -97,8 +116,20 @@
             android:calendarViewShown="false"
             android:datePickerMode="spinner"
             android:spinnersShown="true"
+            android:visibility="gone"
             app:layout_constraintTop_toTopOf="@id/tv_center">
 
         </DatePicker>
+
+        <ImageView
+            android:id="@+id/img_alert"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/all_margin"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@id/tv_center"
+            app:layout_constraintStart_toStartOf="@id/tv_center"
+            app:layout_constraintEnd_toEndOf="@id/tv_center"
+            app:srcCompat="@drawable/ic_alert" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file