订单详情

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.xingdata.zzdpos">
+    package="com.xingdata.zzdpos">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
 
     <application
         android:name=".App"
@@ -25,65 +25,65 @@
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:theme="@style/AppTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ui.login.LoginActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.exception.ErrorDialogActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
         <activity
             android:name=".ui.exception.ServerErrActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
         <activity
             android:name=".ui.payment.PaymentActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.marketing.integral.IntegralActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.marketing.ticket.ReturnTicketActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_ticket"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.sendticke.SendTicketActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_ticket"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.settle.SettleActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.store.StoreActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.announcement.AnnouncementActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
-        <activity android:name=".ui.help.HelpActivity"/>
-        <activity android:name=".ui.feedback.FeedBackActivity"/>
-        <activity android:name=".ui.statistics.StatisticsActivity"/>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity android:name=".ui.help.HelpActivity" />
+        <activity android:name=".ui.feedback.FeedBackActivity" />
+        <activity android:name=".ui.statistics.StatisticsActivity" />
         <activity
             android:name=".ui.vip.VipActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
-        <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity">
-        </activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity"></activity>
+        <activity android:name=".ui.statistics.StatisticsDetailActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.model.Gbound;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.NewSssku;
 import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.model.UsskuParam;
@@ -735,12 +736,12 @@ public final class ApiFactory {
         }
     }
 
-    public static class Sat {
+    public static class Sta {
         /**
          * 查询统计详情
          */
-        public static Observable<Sat> queryNotice() {
-            return Api.getInstance().service.querySat()
+        public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
+            return Api.getInstance().service.querySta()
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())

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

@@ -21,6 +21,7 @@ import com.xingdata.zzdpos.model.Psb;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Ubound;
@@ -174,7 +175,7 @@ interface ApiService {
             ("pageSize") int pageSize);
 
     @POST(C.URL.STA.statistics)
-    Observable<HttpMessage<ApiFactory.Sat>> querySat();
+    Observable<HttpMessage<Sta>> querySta();
 
     @POST(C.URL.PSB.queryDetail)
     Observable<HttpMessage<Psb>> queryPsbDetail(@Query("psbNo") String psbNo, @Query("id") long id);

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -14,6 +14,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ScreenUtils;

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -13,15 +13,15 @@ import com.xingdata.zzdpos.util.ConvertUtil;
  * 订单详情(购物车商品明细)
  */
 public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
-
+    @JSONField(serialize = false)
     public boolean isDiscount() {
         return skuPrice.longValue() != skuPricePay.longValue();
     }
-
+    @JSONField(serialize = false)
     public double getDiscountRate() {
         return skuPricePay / skuPrice * 100;
     }
-
+    @JSONField(serialize = false)
     public Long getPromotionDisRate() {
         return skuPromotionPrice * 100 / skuPricePay;
     }
@@ -221,7 +221,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
                 .getVipDefDiscount() : 100) / 100 : skuPrice;
         detailAmt = skuPricePay * detailCnt;
     }
-
+    @JSONField(serialize = false)
     public Long getPromotionAmt() {
         return detailAmt - (detailCnt * (skuOffFlag > 0 ? skuPromotionPrice * (vip
                 .getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 :

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java

@@ -1030,12 +1030,15 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public List<BaseGoodPrint> getGoodList() {
+        if (saledetailList!=null){
         List<BaseGoodPrint> baseGoodPrints = new ArrayList<>();
         for (Saledetail saledetail : saledetailList) {
             baseGoodPrints.add(saledetail);
         }
         return baseGoodPrints;
-    }
+    }else {
+            return null;
+        }}
 
     @Override
     public String getDRAW_URL() {

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

 package com.xingdata.zzdpos.ui.statistics;
 
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.view.KeyEvent;
 
+import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -10,7 +14,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
-import com.xingdata.zzdpos.ui.statistics.fragment.OrderMainFragment;
+import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
 
@@ -19,6 +23,7 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
 
     private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
     private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_statistics;
@@ -30,6 +35,11 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
 
     }
 
+    @Override
+    public void setSatInfo(Sta sta) {
+        mStatisticsFragment.setSatInfo(sta);
+    }
+
     @Override
     public void showOrderListFragment() {
         mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_ORDER);
@@ -43,10 +53,17 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
     }
 
     @Override
-    public void searchSuc(Pager<Saleorder> saleorderPager,String wd) {
+    public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
         mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
     }
 
+    @Override
+    public void getOrderDetailSuss(Saleorder saleorder) {
+        Intent intent = new Intent(this, StatisticsDetailActivity.class);
+        intent.putExtra(Saleorder.class.getName(), JSON.toJSONString(saleorder));
+        ActivityUtils.startActivity(intent);
+    }
+
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

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

@@ -4,15 +4,23 @@ 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.ui.statistics.fragment.OrderListFragment;
+import com.xingdata.zzdpos.model.Sta;
+import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
 
 /**
  * Created by Administrator on 2017/12/23.
  */
 
 public interface StatisticsContract {
+    interface DetallView extends BaseView {
 
+    }
     interface View extends BaseView {
+        /**
+         * 设置统计信息
+         */
+        void setSatInfo(Sta sta);
+
         /**
          * 跳转订单列表页
          */
@@ -26,7 +34,10 @@ public interface StatisticsContract {
         /**
          * 搜索成功
          */
-        void searchSuc(Pager<Saleorder> saleorderPager,String wd);
+        void searchSuc(Pager<Saleorder> saleorderPager, String wd);
+
+
+        void getOrderDetailSuss(Saleorder saleorder);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -40,6 +51,10 @@ public interface StatisticsContract {
          */
         public abstract void clickOrderList();
 
+        /**
+         * 获取订单明细
+         */
+        public abstract void getOrderDetail(Saleorder saleorder);
 
         /**
          * 获取订单列表
@@ -49,7 +64,7 @@ public interface StatisticsContract {
         /**
          * 搜索订单列表
          */
-        public abstract void getSaleOrderList(String orderNo, int pageNumber,String wd);
+        public abstract void getSaleOrderList(String orderNo, int pageNumber, String wd);
 
         /**
          * 获取统计详情

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

+package com.xingdata.zzdpos.ui.statistics;
+
+
+import android.databinding.DataBindingUtil;
+import android.util.TimeUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
+import com.xingdata.zzdpos.databinding.ViewOrderDetailBinding;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import org.json.JSONObject;
+
+
+public class StatisticsDetailActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsDetailBinding> implements StatisticsContract.DetallView {
+    private Saleorder mSaleorder;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_statistics_detail;
+    }
+
+    @Override
+    public void initView() {
+        initData();
+
+    }
+
+    private void initData() {
+        if (getIntent().getExtras() != null) {
+            String data = getIntent().getStringExtra(Saleorder.class.getName());
+            if (data != null) {
+                mSaleorder = new Gson().fromJson(data, Saleorder.class);
+                mViewBinding.icTitle.tvTitle.setText(R.string.statistics_order_detail_hint);
+                mViewBinding.viewOrderDetail.getViewStub().inflate();
+                ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
+                viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
+                viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(mSaleorder.getCreateTime()));
+                viewOrderDetailBinding.setOrderNo(mSaleorder.getOrderNo());
+                viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(), false));
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
+                viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(),false));
+                viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
+                viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt()+"");
+                if (mSaleorder.getCutAmt()==null||mSaleorder.getCutAmt()==0){
+                    viewOrderDetailBinding.setCutAmtShow(false);
+                }else {
+                    viewOrderDetailBinding.setCutAmtShow(true);
+                    viewOrderDetailBinding.setCutAmt(ConvertUtil.fenToYuan(mSaleorder.getCutAmt(),false));
+                }
+
+
+
+
+
+            }
+        }
+
+    }
+
+    @Override
+    public void onBackPressedSupport() {
+
+        super.onBackPressedSupport();
+    }
+}

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

 package com.xingdata.zzdpos.ui.statistics;
 
 
-import android.view.KeyEvent;
-
-import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.api.ApiFactory;
-import com.xingdata.zzdpos.ui.statistics.fragment.OrderListFragment;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
 
 /**
  * Created by Administrator on 2017/12/23.
@@ -47,11 +45,11 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getSat() {
-        ApiFactory.Sat.queryNotice().doFinally(() -> {
+        ApiFactory.Sta.querySta().doFinally(() -> {
 
         })
-                .subscribe(sat -> {
-
+                .subscribe(sta -> {
+                    mView.setSatInfo(sta);
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });
@@ -61,6 +59,17 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         getOrderList(pageNumber, pageSize, startDate, endDate, fragment);
     }
 
+
+    @Override
+    public void getOrderDetail(Saleorder mSaleorder) {
+        ApiFactory.Test.getSaleOrderDetail(mSaleorder.getId() + "").subscribe(saleorder -> {
+            mView.getOrderDetailSuss(saleorder);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
+    }
+
+
     /**
      * 状态，0：已完成，１：退货，7赊账，99：全部订单
      *
@@ -71,7 +80,12 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList(pageNumber, pageSize, "99", orderNo, wd)
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    mView.searchSuc(saleorderPager,wd);
+                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+                        ToastUtils.showShort("没有查询到相关订单");
+                    } else {
+                        mView.searchSuc(saleorderPager, wd);
+                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.blankj.utilcode.util.TimeUtils;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.databinding.ItemStatisticsBinding;
@@ -28,6 +29,26 @@ public class StatisticsAdapter extends BaseAdapter<Saleorder, ItemStatisticsBind
     protected void convert(ItemStatisticsBinding mViewBinding, Saleorder item) {
               mViewBinding.tvLeftTop.setText(item.getOrderNo());
               mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
+              switch (item.getPayType()){
+                  case C.PAY_CHANNEL.CASH:
+                    mViewBinding.imgLeft.setImageResource(R.mipmap.pay_cash);
+                      break;
+                  case C.PAY_CHANNEL.WECHAT:
+                      mViewBinding.imgLeft.setImageResource(R.mipmap.pay_wechat);
+                      break;
+                  case C.PAY_CHANNEL.ALI:
+                      mViewBinding.imgLeft.setImageResource(R.mipmap.pay_alipay);
+                      break;
+                  case C.PAY_CHANNEL.BANK:
+                      mViewBinding.imgLeft.setImageResource(R.mipmap.pay_card);
+                      break;
+                  case C.PAY_CHANNEL.CARD:
+                      mViewBinding.imgLeft.setImageResource(R.mipmap.pay_membershipcard);
+                      break;
+                  case C.PAY_CHANNEL.TALLY:
+                      mViewBinding.imgLeft.setImageResource(R.mipmap.pay_credit);
+                      break;
+              }
 
     }
 

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

@@ -10,9 +10,11 @@ import com.xingdata.zzdpos.R;
 
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentStatisticsBinding;
+import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.MyMenuItemDecoration;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -65,4 +67,12 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
 
 
     }
+
+    public void setSatInfo(Sta sta) {
+        mViewBinding.setTodayAmt(ConvertUtil.fenToYuan(sta.getSaleAmt(), false));
+        mViewBinding.setTodayOrder(String.valueOf(sta.getSaleCount()));
+        mViewBinding.setTodayRecharge(ConvertUtil.fenToYuan(sta.getCardAmt(), false));
+        mViewBinding.setTodayVipAdd(String.valueOf(sta.getVipCount()));
+    }
+
 }

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

 package com.xingdata.zzdpos.ui.statistics.fragment;
 
 
-import android.support.v4.app.Fragment;
 import android.view.KeyEvent;
 import android.view.View;
 
 import com.blankj.utilcode.util.FragmentUtils;
-import com.blankj.utilcode.util.TimeUtils;
-import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
-import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
 import com.xingdata.zzdpos.databinding.FragmentStatisticsTitleBinding;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saleorder;
-import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
-import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
+import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderMainFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderSearchFragment;
 import com.xingdata.zzdpos.util.OnClickListener;
-import com.xingdata.zzdpos.util.StringUtil;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
 
 
 public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, FragmentStatisticsTitleBinding> {
@@ -52,6 +33,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
         switch (fragmentMenu) {
             case C.MENU.MENU_STATISTICS_ORDER:
                 FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
+
                 mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View view, boolean b) {
@@ -89,6 +71,14 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
         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();
             }
         });
@@ -116,6 +106,11 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             mViewBinding.icTitle.edTitle.clearFocus();
             return true;
         }
+        if (mOrderSearchFragment.isAdded()) {
+            FragmentUtils.remove(mOrderSearchFragment);
+            return true;
+        }
+        mViewBinding.icTitle.edTitle.setText("");
         return false;
 
     }

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

-package com.xingdata.zzdpos.ui.statistics.fragment;
+package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
-import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.TextView;
 
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 
@@ -75,6 +73,12 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         }
 
+        mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                mPresenter.getOrderDetail(mStatisticsAdapter.getData().get(position));
+            }
+        });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);

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

-package com.xingdata.zzdpos.ui.statistics.fragment;
+package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
-import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.view.View;
 
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -13,10 +11,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
 
 import com.xingdata.zzdpos.ui.main.MainPresenter;
-import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
-import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
 import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
-import com.xingdata.zzdpos.util.OnClickListener;
 import com.xingdata.zzdpos.util.StringUtil;
 
 
@@ -24,16 +19,13 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.logging.Handler;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.Observer;
-import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 

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

-package com.xingdata.zzdpos.ui.statistics.fragment;
+package com.xingdata.zzdpos.ui.statistics.fragment.order;
 
 
 import android.support.v7.widget.LinearLayoutManager;
@@ -44,7 +44,7 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (saleorders != null) {
-            setData(saleorders,saleorders.isFirstPage());
+            setData(saleorders, saleorders.isFirstPage());
         }
 
 
@@ -79,9 +79,9 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
 
     }
 
-    public void setCreateDate(Pager<Saleorder> list,String wd) {
+    public void setCreateDate(Pager<Saleorder> list, String wd) {
         this.saleorders = list;
-        this.wd=wd;
+        this.wd = wd;
     }
 
 

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <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"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
+        tools:context="com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <android.support.v7.widget.CardView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="@dimen/all_margin"
+            app:layout_constraintBottom_toTopOf="@id/ll_bottom"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ic_title">
+
+            <ViewStub
+                android:id="@+id/view_order_detail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout="@layout/view_order_detail" />
+        </android.support.v7.widget.CardView>
+
+        <LinearLayout
+            android:id="@+id/ll_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_padding"
+            android:background="@color/white_caocao"
+            android:elevation="@dimen/view_line_L2"
+            android:orientation="horizontal"
+            android:weightSum="2"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                style="@style/button_passive"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_padding"
+                android:layout_weight="1"
+                android:stateListAnimator="@null"
+                android:text="@string/settle_print_receipt"
+                android:textSize="@dimen/all_text_size"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/btn_confirm"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:targetApi="lollipop" />
+
+            <Button
+                android:id="@+id/btn_confirm"
+                style="@style/button_positive"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_padding"
+                android:layout_weight="1"
+                android:stateListAnimator="@null"
+                android:text="@string/pay_return"
+                android:textSize="@dimen/all_text_size"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@id/btn_cancel"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:targetApi="lollipop" />
+
+        </LinearLayout>
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

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

@@ -11,41 +11,15 @@
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
 
 
-        <LinearLayout
-            android:id="@+id/ll_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:padding="@dimen/all_padding"
-              />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:padding="@dimen/all_padding"
-                android:visibility="invisible" />
-        </LinearLayout>
-
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ll_title">
+            app:layout_constraintTop_toTopOf="parent">
 
 
             <android.support.v7.widget.RecyclerView

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

 <layout>
 
+    <data>
+
+        <variable
+            name="todayAmt"
+            type="String" />
+
+        <variable
+            name="todayOrder"
+            type="String" />
+
+        <variable
+            name="todayRecharge"
+            type="String" />
+
+        <variable
+            name="todayVipAdd"
+            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"
@@ -43,7 +62,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="32000"
+                    android:text="@{todayAmt}"
                     android:textColor="@color/white_caocao"
                     android:textSize="@dimen/all_text_size_big_big" />
 
@@ -73,7 +92,7 @@
 
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="256"
+                        android:text="@{todayOrder}"
                         android:textColor="@color/white_caocao" />
 
                     <TextView
@@ -95,7 +114,7 @@
 
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="256"
+                        android:text="@{todayRecharge}"
                         android:textColor="@color/white_caocao" />
 
                     <TextView
@@ -116,7 +135,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="256"
+                        android:text="@{todayVipAdd}"
                         android:textColor="@color/white_caocao" />
 
                     <TextView

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

@@ -19,9 +19,10 @@
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="60dp"
+            android:layout_width="?attr/actionBarSize"
             android:layout_height="match_parent"
-            android:background="@mipmap/go_back"
+            android:background="@color/transparent"
+            android:src="@mipmap/go_back"
             android:onClick="@{onClickListener}" />
 
         <TextView

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

@@ -22,8 +22,7 @@
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:onClick="@{onClickListener}"
-            android:padding="@dimen/all_margin"
-            android:src="@mipmap/back_black"
+            android:src="@mipmap/go_back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

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

@@ -48,7 +48,7 @@
                     android:layout_marginEnd="@dimen/all_padding"
                     android:layout_marginStart="@dimen/dp_4"
                     android:layout_weight="1"
-                    android:background="@color/green_kongrun"
+                    android:background="@color/green_kongrong"
                     android:padding="@dimen/all_padding"
                     android:src="@mipmap/pay_wechat" />
             </TableRow>

app/src/main/res/values/strings.xml

@@ -578,7 +578,16 @@
     <string name="statistics_todayVipAdd_hint">今日新增会员</string>
     <string name="statistics_search_empty">没有查询到订单~</string>
     <string name="statistics_order_edit_hint">请输入单号</string>
-
+    <string name="statistics_order_detail_hint">订单详情</string>
+    <!--商品详情POS-->
+    <string name="oder_detail_date">交易时间:</string>
+    <string name="oder_detail_no">订单号:</string>
+    <string name="oder_detail_oper">收银员:</string>
+    <string name="oder_detail_payType">收款方式:</string>
+    <string name="oder_detail_goodsNum">商品总数:</string>
+    <string name="oder_detail_discountAmt">优惠金额:</string>
+    <string name="oder_detail_SumAmt">合计金额:</string>
+    <string name="oder_detail_cutAmt">抹零金额:</string>
 
 
 </resources>