Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/TangKuPos.iml" filepath="$PROJECT_DIR$/.idea/TangKuPos.iml" />
+      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -362,6 +362,7 @@ public class C {
             private static final String ROOT_URL = PKG + "recard/";
             public static final String checkPwd = ROOT_URL + "checkPwd";
             public static final String fullVip = ROOT_URL + "fullVip";
+            public static final String queryCard = ROOT_URL + "queryCard";
         }
 
         public final class MS {

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

@@ -582,9 +582,8 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
-
-        public static Observable<com.xingdata.zzdpos.model.Saleorder> querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
-            return Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber, pageSize)
+        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> querySaleorderByVipId(Long vipId,int pageNumber ,int pageSize) {
+            return Api.getInstance().service.querySaleorderByVipId(vipId,pageNumber,pageSize)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())
@@ -812,6 +811,16 @@ public final class ApiFactory {
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
         }
+        /**
+         * 查询充值记录
+         */
+        public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId,int pageNum, int pageSize) {
+            return Api.getInstance().service.queryRecharge(vipId,pageNum, pageSize)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+        }
     }
 
     public static class Sta {
@@ -1018,6 +1027,15 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
+//        public static Observable<Pager<VipRechargeOrder>> queryCard(Long vipId) {
+//            return Api.getInstance().service.queryRecharge(vipId,0,10)
+//                    .onErrorReturn(new ErrorFilter<>())
+//                    .map(new ResultFilter<>())
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .retryWhen(new RetryHelper(3));
+//        }
     }
 
     public static class Ms {
@@ -1134,6 +1152,17 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
+
+        public static Observable<Pager<Mscard>> mscardQuery(long vipId) {
+            return Api.getInstance().service.mscardQuery(vipId)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
+
     }
 
     public static class Oper {

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

@@ -196,6 +196,10 @@ 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("vipId") long vipId,@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
@@ -245,7 +249,7 @@ interface ApiService {
     Observable<HttpMessage<Saleorder>> addOrderPayMis(@Body Saleorder.Pay saleorderPay);
 
     @POST(C.URL.SALEORDER.querySaleorderByVipId)
-    Observable<HttpMessage<Saleorder>> querySaleorderByVipId(@Query("vipId") Long vipId, @Query
+    Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId, @Query
             ("pageNumber") int pageNum, @Query("pageSize") int pageSize);
 
 
@@ -280,6 +284,9 @@ interface ApiService {
     Observable<HttpMessage<Vip>> fullVip(@Query("vipId") long vipId, @Query("amtPay") long
             amtPay, @Query("amtSend") long amtSend);
 
+    @POST(C.URL.RECARD.queryCard)
+    Observable<HttpMessage<Pager<VipRechargeOrder>>> queryCard(@Query("vipId") long vipId);
+
     //    @POST(C.URL.SHOP.queryAll)
 //    Observable<HttpMessage<String>> queryAll( @Query("spuClaName") String spuClaName, @Query
 //            ("spuGrpName") String spuGrpName);
@@ -400,6 +407,9 @@ interface ApiService {
     @POST(C.URL.MSCARD.update)
     Observable<HttpMessage<Mscard>> updateMscard(@Body Mscard m);
 
+    @POST(C.URL.MSCARD.query)
+    Observable<HttpMessage<Pager<Mscard>>> mscardQuery(@Query("vipId") Long vipId);
+
     @POST(C.URL.MSCARD.add)
     Observable<HttpMessage<Mscard>> addMscard(@Body Mscard m);
 

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

@@ -5,6 +5,7 @@ import com.xingdata.api.print.entity.BaseOrderPrint;
 import com.xingdata.zzdpos.db.DB;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.ui.marketing.ms.model.BaseBean;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +15,7 @@ import java.util.List;
  * 盘库记录类
  */
 
-public class Cs implements BaseOrderPrint {
+public class Cs implements BaseOrderPrint, com.xingdata.zzdpos.base.BaseBean {
 
     /**
      * channelMapId : 0

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

 package com.xingdata.zzdpos.model;
 
 import com.xingdata.api.print.entity.BaseGoodPrint;
+import com.xingdata.zzdpos.base.BaseBean;
 
 /**
  * Created by Administrator on 2017/12/1.
  */
 
-public class CsDetail implements BaseGoodPrint {
+public class CsDetail implements BaseGoodPrint ,BaseBean{
 
 
     /**

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

@@ -179,4 +179,6 @@ public class Pay extends RealmObject implements BaseModel, BaseBean {
     public String getPrimaryKey() {
         return "id";
     }
+
+//    public static String getPayType
 }

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

@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.annotations.Ignore;
+
 
 /**
  * 订单
@@ -503,6 +505,8 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
     private Long createTime;
 
     private Salepay salepay;
+    @Ignore
+    private String PayName;
 
     private List<Saledetail> saledetailList;
 
@@ -1139,4 +1143,13 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
+
+
+    public void setPayName(String payName) {
+        PayName = payName;
+    }
+
+    public String getPayName() {
+        return PayName;
+    }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java

@@ -26,6 +26,7 @@ import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 import io.realm.Realm;
 import io.realm.RealmResults;
+
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiException;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -41,6 +42,7 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
 import com.xingdata.zzdpos.ui.login.fragment.SmsCodeFragment;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
+import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo;
@@ -83,6 +85,7 @@ public class LoginPresenter extends LoginContract.Presenter {
     }
 
 
+
     @Override
     public void createStoreFragmentinit(Context context, LoadingDialog loadingDialog) {
         //加载城市数据列表，加载门店类型列表

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java

 package com.xingdata.zzdpos.ui.manage.inventory;
 
+
+import android.content.Intent;
+
 import com.blankj.utilcode.util.ActivityUtils;
-import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -9,13 +11,15 @@ import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
 import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.CsDetail;
 import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
 import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
-import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
+import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
+
 
 import java.util.List;
 
@@ -24,7 +28,6 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     private InventoryFragment mInventoryFragment = new InventoryFragment();
     private ManageDateFragment mManageDateFragment = new ManageDateFragment();
     private InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
-    //    private InventoryDetailDialog mInventoryDetailDialog = new InventoryDetailDialog();
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
@@ -61,8 +64,9 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void showInventoryDetailDialog(Cs cs) {
-
-//        mInventoryDetailDialog.setData(cs).show(this);
+        Intent intent = new Intent(InventoryActivity.this, StatisticsDetailActivity.class);
+        intent.putExtra(Cs.class.getName(), cs);
+        ActivityUtils.startActivity(intent);
     }
 
     @Override
@@ -82,10 +86,10 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     @Override
     public void disInventoryDetailFragment(Boolean idChange) {
         if (idChange) {
-//            mInventoryAddFragment.pop();
-//            mPresenter.refreshCs();
+            mInventoryAddFragment.pop();
+            mInventoryFragment.onRefresh();
         } else {
-//            mInventoryAddFragment.pop();
+            mInventoryAddFragment.pop();
         }
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryAdapter.java

@@ -26,15 +26,10 @@ public class InventoryAdapter extends BaseAdapter<Cs, ItemInventoryBinding> {
 
     @Override
     protected void convert(ItemInventoryBinding mViewBinding, Cs item) {
-        Drawable drawable = mContext.getResources().getDrawable(R.mipmap.icon_time);
-        drawable.setBounds(0, 0, (int) mViewBinding.tvDate.getTextSize(), (int) mViewBinding.tvDate.getTextSize());
-
-        mViewBinding.tvDate.setCompoundDrawablesRelative(drawable, null, null, null);
-        mViewBinding.tvDate.setCompoundDrawablePadding(10);
         mViewBinding.tvName.setText(item.getOperName());
         mViewBinding.tvPhone.setText(item.getOper_mobile());
         mViewBinding.tvDate.setText(TimeUtils.millis2String(item.getCreateTime()) + "");
-        mViewBinding.tvNum.setText(item.getCount() + "");
+        mViewBinding.tvNum.setText(item.getCsdetailCount() + "");
         switch (item.getCsResultFlag()) {
             case 0:
                 mViewBinding.tvResult.setText("相符");

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryCartAdapter.java

@@ -4,11 +4,8 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.base.BaseViewHolder;
 import com.xingdata.zzdpos.databinding.ItemInventoryCartBinding;
-import com.xingdata.zzdpos.databinding.ItemStoreSaledetailBinding;
 import com.xingdata.zzdpos.model.CsDetail;
-import com.xingdata.zzdpos.model.Saledetail;
-import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
-import com.xingdata.zzdpos.util.ConvertUtil;
+
 
 import java.util.List;
 
@@ -18,21 +15,11 @@ public class InventoryCartAdapter extends BaseAdapter<CsDetail, ItemInventoryCar
         super(R.layout.item_inventory_cart, csDetailList);
     }
 
-    private CartDialog.OnCountChangeListener mOnCountChangeListener;
-
-    public void setOnCountChangeListener(CartDialog.OnCountChangeListener onCountChangeListener) {
-        this.mOnCountChangeListener = onCountChangeListener;
-    }
-
 
     @Override
     protected void convert(ItemInventoryCartBinding mViewBinding, CsDetail item) {
         mViewBinding.tvName.setText(item.getSpuName());
-
-
-
-
-        mViewBinding.setCount(item.getCsCnt());
+        mViewBinding.setCount(item.getCsCnt() + item.getSpuUnitName());
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryDetailAdapter.java

-//package com.xingdata.zzdpos.ui.manage.inventory.adpter;
-//
-//
-//import android.support.annotation.Nullable;
-//import android.view.View;
-//import android.view.ViewGroup;
-//
-//
-//import java.util.List;
-//
-//public class InventoryDetailAdapter extends BaseAdapter<CsDetail, ItemInventoryLeftBinding> {
-//    private int count = 1;
-//
-//    public InventoryDetailAdapter(@Nullable List<CsDetail> data) {
-//        super(R.layout.item_inventory_left, data);
-//
-//    }
-//
-//
-//    @Override
-//    protected void convert(ItemInventoryLeftBinding mViewBinding, CsDetail item) {
-//
-//        mViewBinding.tvName.setText(item.getSpuName());
-//        mViewBinding.tvStockCount.setText(item.getSkuCnt() + "");
-//        mViewBinding.tvResultCount.setText(item.getCsCnt() + "");
-//        switch (item.getCsResultFlag()) {
-//            case 0://相等
-//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_equal);
-//                break;
-//            case 1://盘多
-//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_more);
-//                break;
-//            case 2://盘少
-//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_less);
-//                break;
-//        }
-//    }
-//
-//    @Override
-//    protected View getItemView(int layoutResId, ViewGroup parent) {
-//        return super.getItemView(layoutResId, parent);
-//    }
-//
-//
-//}
+package com.xingdata.zzdpos.ui.manage.inventory.adpter;
+
+
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemInventoryLeftBinding;
+import com.xingdata.zzdpos.model.CsDetail;
+
+import java.util.List;
+
+public class InventoryDetailAdapter extends BaseAdapter<CsDetail, ItemInventoryLeftBinding> {
+    private int count = 1;
+
+    public InventoryDetailAdapter(@Nullable List<CsDetail> data) {
+        super(R.layout.item_inventory_left, data);
+
+    }
+
+
+    @Override
+    protected void convert(ItemInventoryLeftBinding mViewBinding, CsDetail item) {
+
+        mViewBinding.tvName.setText(item.getSpuName());
+        mViewBinding.tvStockCount.setText(item.getSkuCnt() + "");
+        mViewBinding.tvResultCount.setText(item.getCsCnt() + "");
+        switch (item.getCsResultFlag()) {
+            case 0://相等
+                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_equal);
+                break;
+            case 1://盘多
+                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_more);
+                break;
+            case 2://盘少
+                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_less);
+                break;
+        }
+    }
+
+    @Override
+    protected View getItemView(int layoutResId, ViewGroup parent) {
+        return super.getItemView(layoutResId, parent);
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/CsCartDialog.java

@@ -5,25 +5,22 @@ import android.support.v7.widget.LinearLayoutManager;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseSheetDialog;
-import com.xingdata.zzdpos.databinding.DialogStoreCartBinding;
+import com.xingdata.zzdpos.databinding.DialogInventoryCartBinding;
+
 import com.xingdata.zzdpos.model.CsDetail;
-import com.xingdata.zzdpos.model.Saledetail;
-import com.xingdata.zzdpos.model.Saleorder;
+
+import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
 import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryCartAdapter;
-import com.xingdata.zzdpos.ui.store.StorePresenter;
-import com.xingdata.zzdpos.ui.store.adapter.SaledetailAdapter;
 
 import java.util.List;
 
 
-public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartBinding> {
+public class CsCartDialog extends BaseSheetDialog<InventoryPresenter, DialogInventoryCartBinding> {
 
 
     private List<CsDetail> mCsDetails;
+    private String result;
 
-    public interface OnCountChangeListener {
-        void onCountChange(Saledetail saledetail, int value);
-    }
 
     @Override
     protected boolean isTransparentBackground() {
@@ -32,22 +29,35 @@ public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCar
 
     @Override
     public int getLayoutId() {
-        return R.layout.dialog_store_cart;
+        return R.layout.dialog_inventory_cart;
     }
 
     @Override
     public void initView() {
-        ;
+
 
         // init C
         InventoryCartAdapter mInventoryCartAdapter = new InventoryCartAdapter(mCsDetails);
         mViewBinding.rlCart.setAdapter(mInventoryCartAdapter);
         mViewBinding.rlCart.setLayoutManager(new LinearLayoutManager(mContext));
-
+        mViewBinding.setCartCount(getCount());
+        mViewBinding.setResult(result);
 
         // set Other listener
-        mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
-        mViewBinding.tvClear.setOnClickListener(view -> mPresenter.clearCart());
+        mViewBinding.tvOk.setOnClickListener(view -> mPresenter.exitInventoryAdd());
+
+    }
+
+    public void setResult(String s) {
+        result = s;
+    }
+
+    private int getCount() {
+        long i = 0;
+        for (CsDetail csDetail : mCsDetails) {
+            i = i + csDetail.getCsCnt();
+        }
+        return (int) i;
     }
 
     @Override
@@ -58,14 +68,13 @@ public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCar
     }
 
 
-    public CsCartDialog setSaledetails(List<CsDetail> csDetailList) {
+    public CsCartDialog setCsDetails(List<CsDetail> csDetailList) {
         this.mCsDetails = csDetailList;
         return this;
     }
 
     @Override
     public void onDestroyView() {
-        mPresenter.exitCartDialog();
         super.onDestroyView();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/InventoryDetailDialog.java

-//package com.xingdata.zzdpos.ui.manage.inventory.dialog;
-//
-//import android.support.v7.widget.LinearLayoutManager;
-//import android.view.View;
-//
-//import com.blankj.utilcode.util.TimeUtils;
-//import com.blankj.utilcode.util.ToastUtils;
-//import com.xingdata.api.print.ZX_PrintPOS;
-//import com.xingdata.zzdhd.R;
-//import com.xingdata.zzdhd.base.BaseDialog;
-//import com.xingdata.zzdhd.databinding.DialogInventoryDetailBinding;
-//import com.xingdata.zzdhd.model.Cs;
-//import com.xingdata.zzdhd.model.CsDetail;
-//import com.xingdata.zzdhd.ui.manager.inventory.InventoryPresenter;
-//import com.xingdata.zzdhd.ui.manager.inventory.adpter.InventoryDetailAdapter;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2017/12/4.
-// */
-//
-//public class InventoryDetailDialog extends BaseDialog<InventoryPresenter, DialogInventoryDetailBinding> {
-//    private InventoryDetailAdapter mInventoryDetailAdapter;
-//    private List<CsDetail> csDetails = new ArrayList<>();
-//    private Cs cs;
-//    private long mExitTime=0;
-//
-//
-//    @Override
-//    public int getLayoutId() {
-//        return R.layout.dialog_inventory_detail;
-//    }
-//
-//    @Override
-//    public void initView() {
-//        initLeftRecycler();
-//        if (cs == null) {
-//            ToastUtils.showShort("未获取到相关数据");
-//            return;
-//        }
-//        setBtnName("取消", "打印清单");
-//        mViewBinding.setOperName(cs.getOperName());
-//        mViewBinding.setDate(TimeUtils.millis2String(cs.getCreateTime()));
-//        mViewBinding.setSumNum(cs.getCount() + "");
-//        switch (cs.getCsResultFlag()) {
-//            case 0:
-//                mViewBinding.setFinallyResult("相符");
-//                break;
-//            case 1:
-//                mViewBinding.setFinallyResult("不相符");
-//                break;
-//        }
-//        csDetails.clear();
-//        csDetails.addAll(cs.getCsdetailList());
-//        mInventoryDetailAdapter.notifyDataSetChanged();
-//        getDialog().setCanceledOnTouchOutside(false);
-//
-//    }
-//
-//    @Override
-//    protected boolean isShowTitle() {
-//        return false;
-//    }
-//
-//    public InventoryDetailDialog setData(Cs csDetailList) {
-//        this.cs = csDetailList;
-//        return this;
-//    }
-//
-//    private void initLeftRecycler() {
-//        mViewBinding.replenishmentLeftRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-//        mInventoryDetailAdapter = new InventoryDetailAdapter(csDetails);
-//        mViewBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
-//    }
-//
-//    @Override
-//    public void onConfirmClick(View view) {
-//        if ((System.currentTimeMillis() - mExitTime) > 2000) {
-//            ZX_PrintPOS.getInstance(mContext).printInventory(1,cs);
-//        } else {
-//
-//        }
-//        super.onConfirmClick(view);
-//    }
-//}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -6,17 +6,15 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
-import com.blankj.utilcode.util.KeyboardUtils;
-import com.blankj.utilcode.util.TimeUtils;
+
 import com.blankj.utilcode.util.ToastUtils;
-import com.xingdata.api.print.ZX_PrintPOS;
+
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentInventoryAddBinding;
 import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.CsDetail;
-import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
@@ -56,7 +54,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
         initRecycler();
         mViewBinding.setCartCount(0);
-
+        mViewBinding.icTitle.edTitle.setHint(R.string.inventory_add_et_hint);
         mViewBinding.icTitle.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
@@ -73,25 +71,24 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 if (bottomCsList.size() == 0) {
                     return;
                 }
-                mCartDialog.setSaledetails(bottomCsList).show((BaseActivity) getActivity());
+                mCartDialog.setCsDetails(bottomCsList).show((BaseActivity) getActivity());
+            }
+        });
+        mViewBinding.btnEnd.setOnClickListener(view -> {
+            mPresenter.exitInventoryAdd();
+        });
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                PromptDialog promptDialog = new PromptDialog();
+                promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
+                    mPresenter.cancelInventoryAdd(mCs);
+                    promptDialog.dismiss();
+                }, view1 -> {
+                    promptDialog.dismiss();
+                }).setCancelables(false).show((BaseActivity) mContext);
             }
         });
-//        mViewBinding.btnEnd.setOnClickListener(view -> {
-//            mPresenter.exitInventoryAdd();
-//        });
-//        mViewBinding.btnDel.setOnClickListener(view -> {
-//            {
-//                PromptDialog promptDialog = new PromptDialog();
-//                promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认删除本次盘库记录").setClick(view1 -> {
-//                    mPresenter.cancelInventoryAdd(mCs);
-//                    promptDialog.dismiss();
-//                }, view1 -> {
-//                    promptDialog.dismiss();
-//                }).setCancelables(false).show((BaseActivity) mContext);
-//
-//            }
-//
-//        });
 //        mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
 //            @Override
 //            protected void myOnClickListener(View v) {
@@ -186,8 +183,10 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mInventoryGoodsAdapter.notifyDataSetChanged();
         if (isResult) {
             mViewBinding.setResult("相符");
+            mCartDialog.setResult("相符");
         } else {
             mViewBinding.setResult("不相符");
+            mCartDialog.setResult("不相符");
         }
     }
 
@@ -204,6 +203,20 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mCs.setCsdetailList(bottomCsList);
     }
 
+    @Override
+    public boolean onBackPressedSupport() {
+        PromptDialog promptDialog = new PromptDialog();
+        promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
+            mPresenter.cancelInventoryAdd(mCs);
+            promptDialog.dismiss();
+
+        }, view1 -> {
+            promptDialog.dismiss();
+            pop();
+
+        }).setCancelables(false).show((BaseActivity) mContext);
+        return true;
+    }
 
     public void searchGoodsSuc() {
 //        mViewBinding.etKeyword.setText("");

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryFragment.java

@@ -121,7 +121,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         mViewBinding.tvCount.setText(count);
     }
 
-    private void onRefresh() {
+    public void onRefresh() {
         start = null;
         end = null;
         pageNum = 1;

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java

@@ -21,7 +21,6 @@ import java.util.List;
 public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendTickerVipBinding> {
 
     private VipAdapter mVipAdapter;
-
     @Override
     public int getLayoutId() {
         return R.layout.fragment_send_ticker_vip;

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

@@ -5,6 +5,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
 import android.graphics.Paint;
+import android.support.v7.widget.LinearLayoutManager;
 import android.util.TimeUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,19 +14,23 @@ import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
 import com.google.gson.Gson;
 import com.xingdata.api.print.ZX_PrintPOS;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
 import com.xingdata.zzdpos.databinding.ItemSettleSaledetailBinding;
+import com.xingdata.zzdpos.databinding.ViewInventoryDetailBinding;
 import com.xingdata.zzdpos.databinding.ViewOrderDetailBinding;
 import com.xingdata.zzdpos.databinding.ViewTicketBinding;
 import com.xingdata.zzdpos.databinding.ViewVipRechargeBinding;
+import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.MainActivity;
+import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -57,6 +62,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             Long data = getIntent().getLongExtra(Saleorder.class.getName(), -1);
             VipRechargeOrder vipRechargeOrder = (VipRechargeOrder) getIntent().getSerializableExtra(VipRechargeOrder.class.getName());
             Ticket ticket = (Ticket) getIntent().getSerializableExtra(Ticket.class.getName());
+            Cs cs = (Cs) getIntent().getSerializableExtra(Cs.class.getName());
             if (data > 0) {
                 mPresenter.getOrderDetail(String.valueOf(data));
                 mViewBinding.icTitle.tvTitle.setText(R.string.statistics_order_detail_hint);
@@ -69,6 +75,10 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 mViewBinding.icTitle.tvTitle.setText(R.string.statistics_used_ticket_hint);
                 getTicketSuss(ticket);
             }
+            if (cs != null) {
+                mViewBinding.icTitle.tvTitle.setText(R.string.statistics_inventory_detail_hint);
+                getCsSuss(cs);
+            }
         }
 
     }
@@ -88,6 +98,44 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     }
 
+
+    private void getCsSuss(Cs cs) {
+        mViewBinding.viewCs.getViewStub().inflate();
+        ViewInventoryDetailBinding viewInventoryDetailBinding = DataBindingUtil.bind(mViewBinding.viewCs.getRoot());
+        viewInventoryDetailBinding.replenishmentLeftRecycler.setLayoutManager(new LinearLayoutManager(this));
+        InventoryDetailAdapter mInventoryDetailAdapter = new InventoryDetailAdapter(cs.getCsdetailList());
+        viewInventoryDetailBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
+        mViewBinding.btnPrint.setText("取消");
+        mViewBinding.btnReturn.setText("打印清单");
+        viewInventoryDetailBinding.setOperName(cs.getOperName());
+        viewInventoryDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(cs.getCreateTime()));
+        viewInventoryDetailBinding.setSumNum(cs.getCount() + "");
+        switch (cs.getCsResultFlag()) {
+            case 0:
+                viewInventoryDetailBinding.setFinallyResult("相符");
+                break;
+            case 1:
+                viewInventoryDetailBinding.setFinallyResult("不相符");
+                break;
+        }
+        mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, cs);
+                mViewBinding.btnReturn.setEnabled(false);
+                mViewBinding.btnReturn.setText("已打印");
+
+
+            }
+        });
+        mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                finish();
+            }
+        });
+    }
+
     private void getVipRechargeOrderSuss(VipRechargeOrder vipRechargeOrder) {
         mViewBinding.btnReturn.setVisibility(View.GONE);
         mViewBinding.viewVipRecharge.getViewStub().inflate();

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

@@ -4,10 +4,13 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityVipBinding;
 import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Mscard;
 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.Vip;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
 
@@ -40,6 +43,21 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
         mPresenter.vipInfoFragment.ticketQuerySus(ticketPager);
     }
 
+    @Override
+    public void getSaleorderSus(Pager<Saleorder> saleorderPager) {
+        mPresenter.vipExpenseListFragment.getSaleorderSus(saleorderPager);
+    }
+
+    @Override
+    public void getRechargeOrderSus(Pager<VipRechargeOrder> rechargeOrderPager) {
+    mPresenter.vipRechargeListFragment.getRechargeOrderSus(rechargeOrderPager);
+    }
+
+    @Override
+    public void getMscardSus(Pager<Mscard> mscardPager) {
+    mPresenter.vipMscardListFragment.getMscardSus(mscardPager);
+    }
+
     @Override
     public void getVipLevelSus(Pager<Level> levelPager) {
         mPresenter.vipListFragment.getVipLevelSus(levelPager);

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java

@@ -3,10 +3,13 @@ package com.xingdata.zzdpos.ui.vip;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Mscard;
 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.Vip;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
 
 import java.util.List;
 
@@ -15,11 +18,24 @@ public interface VipContract {
 
     interface View extends BaseView {
         void addVip();
+
         void getVipLevelSus(Pager<Level> levelPager);
+
         void getVipListSus(Pager<Vip> vipPager, int pageNumber);
+
         void getVipNumberSus(Sta sta);
+
         void addVipSus(Vip vip);
+
         void ticketQuerySus(List<Ticket> ticketPager);
+
+        void getSaleorderSus(Pager<Saleorder> saleorderPager);
+
+        void getRechargeOrderSus(Pager<VipRechargeOrder> rechargeOrderPager);
+        void getMscardSus(Pager<Mscard> rechargeOrderPager);
+
+
+
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -29,8 +45,15 @@ public interface VipContract {
                 pageSize);
 
         public abstract void getVipNumber();
+
         public abstract void addVip(Vip vip);
+
         public abstract void ticketQuery(Long vipID);
-        public abstract  void saleorderQuery(Long vipID);
+
+        public abstract void saleorderQuery(Long vipID, int pageNumber);
+
+        public abstract void rechargeorderQuery(Long vipID, int number);
+
+        public abstract void mscardQuery(Long vipID);
     }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -4,16 +4,20 @@ package com.xingdata.zzdpos.ui.vip;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.vip.fragment.VipMscardListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
+import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeListFragment;
 
 public class VipPresenter extends VipContract.Presenter {
-    public VipListFragment vipListFragment=new VipListFragment();
-    public VipInfoEditFragment vipInfoEditFragment=new VipInfoEditFragment();
+    public VipListFragment vipListFragment = new VipListFragment();
+    public VipInfoEditFragment vipInfoEditFragment = new VipInfoEditFragment();
     public VipInfoFragment vipInfoFragment = new VipInfoFragment();
     public VipExpenseListFragment vipExpenseListFragment = new VipExpenseListFragment();
+    public VipRechargeListFragment vipRechargeListFragment = new VipRechargeListFragment();
+    public VipMscardListFragment vipMscardListFragment = new VipMscardListFragment();
 
     @Override
     public void onAttached() {
@@ -79,13 +83,35 @@ public class VipPresenter extends VipContract.Presenter {
     }
 
     @Override
-    public void saleorderQuery(Long vipID) {
-        ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> {
-//            mView.ticketQuerySus(ticketList);
+    public void saleorderQuery(Long vipID, int pageNumber) {
+        ApiFactory.Saleorder.querySaleorderByVipId(vipID, pageNumber, 5).subscribe(saleorder -> {
+            mView.getSaleorderSus(saleorder);
         }, throwable -> {
             ToastUtils.showShort(throwable.getMessage());
         });
     }
 
+    @Override
+    public void rechargeorderQuery(Long vipID,int number) {
+        ApiFactory.Rctrace.queryRecharge(vipID, number, 10).subscribe(rechargeOrderPager -> {
+            mView.getRechargeOrderSus(rechargeOrderPager);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
+
+    }
+
+    @Override
+    public void mscardQuery(Long vipID) {
+        ApiFactory.MsCard.mscardQuery(vipID).subscribe(mscardPager -> {
+            mView.getMscardSus(mscardPager);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
+
+
+
+    }
+
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipExpenseAdapter.java

+package com.xingdata.zzdpos.ui.vip.adapter;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemVipExpenseItemBinding;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.StringUtil;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by JM_DEV on 2017/12/25.
+ */
+
+public class VipExpenseAdapter extends BaseAdapter<Saleorder, ItemVipExpenseItemBinding> {
+    private Context mContext;
+    private String shopName;
+
+
+    public VipExpenseAdapter(Context mContext, @Nullable List<Saleorder> data) {
+        super(R.layout.item_vip_expense_item, data);
+        this.mContext = mContext;
+    }
+
+    @Override
+    protected void convert(ItemVipExpenseItemBinding mViewBinding, Saleorder item) {
+        mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getOrderPayAmt()));
+        mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
+        getPayName(item);
+        //设置支付方式
+        mViewBinding.expenseType.setText(item.getPayName());
+        mViewBinding.imgLeft.setBackgroundResource(getPayName(item));
+        mViewBinding.expenseTime.setText(StringUtil.format(new Date(item.getCreateTime()),StringUtil.mmddhhmmmDatePattern));
+    }
+
+    public Integer getPayName(Saleorder item) {
+        Integer inBG=-1;
+        switch (item.getPayType()) {
+            case C.PAY_CHANNEL.CASH:
+                inBG = R.mipmap.pay_cash;
+                break;
+            case C.PAY_CHANNEL.WECHAT:
+                inBG = R.mipmap.pay_wechat;
+                break;
+            case C.PAY_CHANNEL.ALI:
+                inBG = R.mipmap.pay_alipay;
+                break;
+            case C.PAY_CHANNEL.BANK:
+                inBG = R.mipmap.pay_card;
+                break;
+            case C.PAY_CHANNEL.CARD:
+                inBG = R.mipmap.pay_membershipcard;
+                break;
+            case C.PAY_CHANNEL.TALLY:
+                inBG = R.mipmap.pay_credit;
+                break;
+        }
+        return inBG;
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipListAdapter.java

@@ -27,6 +27,6 @@ public class VipListAdapter extends BaseAdapter<Vip, ItemVipListItemBinding> {
     protected void convert(ItemVipListItemBinding mViewBinding, Vip item) {
         mViewBinding.vipName.setText(item.getVipName());
         mViewBinding.vipMobile.setText(String.valueOf(item.getVipMobile()));
-        mViewBinding.vipDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount()));
+        mViewBinding.vipDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount())+"折");
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipMscardAdapter.java

+package com.xingdata.zzdpos.ui.vip.adapter;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemVipExpenseItemBinding;
+import com.xingdata.zzdpos.model.Mscard;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.StringUtil;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by JM_DEV on 2017/12/25.
+ */
+
+public class VipMscardAdapter extends BaseAdapter<Mscard, ItemVipExpenseItemBinding> {
+    private Context mContext;
+    private String shopName;
+
+
+    public VipMscardAdapter(Context mContext, @Nullable List<Mscard> data) {
+        super(R.layout.item_vip_expense_item, data);
+        this.mContext = mContext;
+    }
+
+    @Override
+    protected void convert(ItemVipExpenseItemBinding mViewBinding, Mscard item) {
+//        mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getCardAmtPay()));
+//        mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
+//        //设置支付方式
+////        mViewBinding.expenseType.setText(item.getPayName());
+////        mViewBinding.imgLeft.setBackgroundResource(getPayName(item));
+//        mViewBinding.expenseTime.setText(StringUtil.format(new Date(item.getCreateTime()),StringUtil.mmddhhmmmDatePattern));
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java

@@ -3,25 +3,67 @@ package com.xingdata.zzdpos.ui.vip.adapter;
 import android.content.Context;
 import android.support.annotation.Nullable;
 
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
-import com.xingdata.zzdpos.databinding.ItemVipRechargeItemBinding;
+import com.xingdata.zzdpos.databinding.ItemVipExpenseItemBinding;
+import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.StringUtil;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * Created by JM_DEV on 2017/12/25.
  */
 
-public class VipRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemVipRechargeItemBinding> {
+public class VipRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemVipExpenseItemBinding> {
     private Context mContext;
+    private String shopName;
+
 
     public VipRechargeAdapter(Context mContext, @Nullable List<VipRechargeOrder> data) {
-        super(R.layout.item_vip_recharge_item, data);
-        this.mContext=mContext;
+        super(R.layout.item_vip_expense_item, data);
+        this.mContext = mContext;
     }
+
     @Override
-    protected void convert(ItemVipRechargeItemBinding mViewBinding, VipRechargeOrder item) {
+    protected void convert(ItemVipExpenseItemBinding mViewBinding, VipRechargeOrder item) {
+        mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getCardAmtPay()));
+        mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
+        //设置支付方式
+//        mViewBinding.expenseType.setText(item.getPayName());
+//        mViewBinding.imgLeft.setBackgroundResource(getPayName(item));
+        mViewBinding.expenseTime.setText(StringUtil.format(new Date(item.getCreateTime()),StringUtil.mmddhhmmmDatePattern));
+    }
+
+    public Integer getPayName(Saleorder item) {
+        Integer inBG=-1;
+        switch (item.getPayType()) {
+            case C.PAY_CHANNEL.CASH:
+                inBG = R.mipmap.pay_cash;
+                break;
+            case C.PAY_CHANNEL.WECHAT:
+                inBG = R.mipmap.pay_wechat;
+                break;
+            case C.PAY_CHANNEL.ALI:
+                inBG = R.mipmap.pay_alipay;
+                break;
+            case C.PAY_CHANNEL.BANK:
+                inBG = R.mipmap.pay_card;
+                break;
+            case C.PAY_CHANNEL.CARD:
+                inBG = R.mipmap.pay_membershipcard;
+                break;
+            case C.PAY_CHANNEL.TALLY:
+                inBG = R.mipmap.pay_credit;
+                break;
         }
+        return inBG;
+
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java

@@ -11,6 +11,8 @@ import com.xingdata.zzdpos.ui.vip.VipContract;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
+import com.xingdata.zzdpos.ui.vip.fragment.VipMscardListFragment;
+import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeListFragment;
 
 import java.util.List;
 
@@ -21,6 +23,7 @@ import java.util.List;
 public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMenuBinding> {
     private Vip mVip;
     private List<Level> mLevel;
+
     @Override
     public int getLayoutId() {
         return R.layout.dialog_vip_menu;
@@ -32,21 +35,28 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
             switch (view.getId()) {
                 //編輯會員
                 case R.id.editVip:
-                    mPresenter.vipInfoEditFragment=new VipInfoEditFragment();
+                    mPresenter.vipInfoEditFragment = new VipInfoEditFragment();
                     mPresenter.vipInfoEditFragment.setVip(mVip);
                     mPresenter.vipInfoEditFragment.setVipLevel(mLevel);
-                    ((BaseActivity) getActivity()).start(  mPresenter.vipInfoEditFragment);
+                    ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
                     break;
                 //充值記錄
                 case R.id.rechargeList:
-
+                    mPresenter.vipRechargeListFragment = new VipRechargeListFragment();
+                    mPresenter.vipRechargeListFragment.setVip(mVip);
+                    mPresenter.vipRechargeListFragment.setVipLevel(mLevel);
+                    ((BaseActivity) getActivity()).start(mPresenter.vipRechargeListFragment);
                     break;
                 //優惠券詳情
                 case R.id.voucherDetails:
+                    mPresenter.vipMscardListFragment = new VipMscardListFragment();
+                    mPresenter.vipMscardListFragment.setVip(mVip);
+                    ((BaseActivity) getActivity()).start(mPresenter.vipMscardListFragment);
                     break;
                 //消費記錄
                 case R.id.consumeList:
-                    ((BaseActivity) getActivity()).start(new VipExpenseListFragment());
+                    mPresenter.vipExpenseListFragment.setmVip(mVip);
+                    ((BaseActivity) getActivity()).start(mPresenter.vipExpenseListFragment);
                     break;
             }
             dismiss();

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java

@@ -6,6 +6,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
 
 import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
@@ -13,10 +14,14 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipExpenseListBinding;
 import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipExpenseAdapter;
 import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
+import com.xingdata.zzdpos.util.ConvertUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +31,10 @@ import java.util.List;
  */
 @SuppressLint("ValidFragment")
 public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding> {
-    private VipRechargeAdapter vipRechargeAdapter;
-    private List<VipRechargeOrder> orders = new ArrayList<>();
-    private List<Level> levels=null;
+    private VipExpenseAdapter vipRechargeAdapter;
+    private List<Saleorder> orders = new ArrayList<>();
+    private List<Level> levels = null;
+    private int pageNumber = 0;
 
 
     @Override
@@ -36,34 +42,40 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
         return R.layout.fragment_vip_expense_list;
     }
 
+    private Vip mVip;
+
     @Override
     public void initView() {
-        mViewBinding.infoTitle.tvTitle.setText("会员信息");
-        vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
+        mViewBinding.infoTitle.tvTitle.setText("消费记录");
+        vipRechargeAdapter = new VipExpenseAdapter(getActivity(), orders);
         mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
         mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
+        mViewBinding.expenseAMT.setText(ConvertUtil.fenToYuan2(mVip.getVipTotalpamt()));
+        mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
+        mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
+        mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
+        mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
         vipRechargeAdapter.setEnableLoadMore(true);
         vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
-        mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
+        mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
             new VipEditMenuDialog().show((BaseActivity) getActivity());
         });
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
-
+        onRefresh();
     }
 
     private void onLoadMore() {
-        vipRechargeAdapter.addData(new VipRechargeOrder());
-        vipRechargeAdapter.setEnableLoadMore(true);
-        vipRechargeAdapter.loadMoreComplete();
-        ToastUtils.showShort("刷新成功");
+        mPresenter.saleorderQuery(mVip.getVipId(), pageNumber);
+        vipRechargeAdapter.setEnableLoadMore(false);
     }
 
     private void onRefresh() {
-        mViewBinding.rechargeRefresh.setRefreshing(false);
-        ToastUtils.showShort("刷新成功");
+        pageNumber = 0;
+        mPresenter.saleorderQuery(mVip.getVipId(), pageNumber);
+
     }
 
     @Override
@@ -71,4 +83,30 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
         pop();
         return true;
     }
+
+
+    public void setmVip(Vip mVip) {
+        this.mVip = mVip;
+    }
+
+    public void getSaleorderSus(Pager<Saleorder> saleorderPager) {
+
+        if (saleorderPager.isFirstPage()) {
+            orders.clear();
+        }
+
+        if (saleorderPager.getList().size() != 0) {
+            orders.addAll(saleorderPager.getList());
+            vipRechargeAdapter.notifyDataSetChanged();
+            pageNumber = saleorderPager.getPageNumber() + 1;
+        }
+        if (saleorderPager.isLastPage()) {
+            ToastUtils.showShort("没有更多数据");
+        }
+        mViewBinding.expenseCount.setText(saleorderPager.getTotalRow() + "");
+        vipRechargeAdapter.setEnableLoadMore(!saleorderPager.isLastPage());
+        vipRechargeAdapter.loadMoreComplete();
+        mViewBinding.rechargeRefresh.setRefreshing(false);
+
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java

@@ -38,6 +38,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
             dialog.setVip(mVip);
             dialog.show((BaseActivity) getActivity());
         });
+        if (mVip!=null){
             mViewBinding.Totalpamt.setText(String.valueOf(mVip.getVipTotalpamt()));
             mViewBinding.BoundCbal.setText(String.valueOf(mVip.getBoundCbal()));
             mViewBinding.AcctCbal.setText(String.valueOf(mVip.getAcctCbal()));
@@ -50,6 +51,8 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
             mPresenter.ticketQuery(mVip.getVipId());
         }
 
+    }
+
     private String getVipSex(Byte vipSex) {
         if (vipSex.toString().equals("1")) {
             return "男";

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -7,9 +7,13 @@ package com.xingdata.zzdpos.ui.vip.fragment;
 import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.Gravity;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -62,6 +66,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
                     break;
             }
         });
+//        mViewBinding.titleSearch.serchEditText.setOnFocusChangeListener((View view, boolean b) -> {
+//            if (b){
+//                VipSearchFragment vipSearchFragment = new VipSearchFragment();
+//                vipSearchFragment.setBaseFragment(new VipInfoFragment());
+//            }
+//        });
         mPresenter.getVipLevel(0, 200);
         mPresenter.getVipNumber();
     }
@@ -155,23 +165,18 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 
 
     public void toStartVipInfo(Vip vip) {
-        mPresenter.vipInfoFragment = new VipInfoFragment();
+        if (vip != null) {
             mPresenter.vipInfoFragment.setVip(vip);
             mPresenter.vipInfoFragment.setLevel(levels);
             ((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
+        } else {
+            mPresenter.vipInfoEditFragment.setVipLevel(levels);
+            ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
+        }
+
     }
 
     public void addVipSus(Vip vip) {
-//        mPresenter.vipInfoFragment.pop();
-//        mPresenter.vipInfoFragment.setVip(vip);
-//        mPresenter.vipInfoFragment.setLevel(levels);
-//        ((BaseActivity) getActivity()).start( mPresenter.vipInfoFragment);
-//        if (vipInfoFragment != null) {
-//            if (vipInfoFragment.getmVip().getVipId() == null) {
-//                onRefresh();
-//            }
-//            vipInfoFragment.pop();
-//        }
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipMscardListFragment.java

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import android.annotation.SuppressLint;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentVipExpenseListBinding;
+import com.xingdata.zzdpos.databinding.FragmentVipMscardListBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Mscard;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipExpenseAdapter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipMscardAdapter;
+import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 优惠券列表
+ */
+@SuppressLint("ValidFragment")
+public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVipMscardListBinding> {
+    private VipMscardAdapter adapter;
+    private List<Mscard> mscards = new ArrayList<>();
+    private int valid = 0;
+    private int inValid = 0;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_vip_mscard_list;
+    }
+
+    private Vip mVip;
+
+    @Override
+    public void initView() {
+        mViewBinding.infoTitle.tvTitle.setText("优惠券详情");
+        adapter = new VipMscardAdapter(getActivity(), mscards);
+        mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.rechargeRecyclerView.setAdapter(adapter);
+        mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
+        mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
+        mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
+        mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
+        mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
+        adapter.setEnableLoadMore(true);
+        adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
+        mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
+            new VipEditMenuDialog().show((BaseActivity) getActivity());
+        });
+        mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
+            pop();
+        });
+        onRefresh();
+    }
+
+    private void onLoadMore() {
+//        mPresenter.saleorderQuery(mVip.getVipId(), pageNumber);
+//        adapter.setEnableLoadMore(false);
+    }
+
+    private void onRefresh() {
+        mPresenter.mscardQuery(mVip.getVipId());
+    }
+
+    @Override
+    public boolean onBackPressedSupport() {
+        pop();
+        return true;
+    }
+
+
+    public void setVip(Vip mVip) {
+        this.mVip = mVip;
+    }
+
+
+    public void getMscardSus(Pager<Mscard> mscardPager) {
+
+        if (mscardPager.isFirstPage()) {
+            mscards.clear();
+        }
+        if (mscardPager.getList().size() != 0) {
+            mscards.addAll(mscardPager.getList());
+            adapter.notifyDataSetChanged();
+//            pageNumber = mscardPager.getPageNumber() + 1;
+        }
+        getMscardValid();
+        if (mscardPager.isLastPage()) {
+            ToastUtils.showShort("没有更多数据");
+        }
+        mViewBinding.mscardValid.setText(valid+ "");
+        mViewBinding.macardInvalid.setText(inValid+"");
+        adapter.setEnableLoadMore(!mscardPager.isLastPage());
+        adapter.loadMoreComplete();
+        mViewBinding.rechargeRefresh.setRefreshing(false);
+
+    }
+
+    private void getMscardValid() {
+        for (Mscard m : mscards) {
+            if (m.getCruleStatus().toString().equals("0")) {
+                valid = valid + 1;
+            } else {
+                inValid = inValid + 1;
+            }
+        }
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import android.annotation.SuppressLint;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentVipRechargeListBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
+import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 会员充值记录
+ */
+@SuppressLint("ValidFragment")
+public class VipRechargeListFragment extends BaseFragment<VipPresenter, FragmentVipRechargeListBinding> {
+    private VipRechargeAdapter vipRechargeAdapter;
+    private List<VipRechargeOrder> orders = new ArrayList<>();
+    private int pageNumber = 0;
+    private List<Level> levels;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_vip_recharge_list;
+    }
+
+    private Vip mVip;
+
+    @Override
+    public void initView() {
+        mViewBinding.infoTitle.tvTitle.setText("充值记录");
+        vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
+        mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
+        mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
+        mViewBinding.rechargeAMT.setText(ConvertUtil.fenToYuan2(mVip.getVipTotalpamt()));
+        mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
+        mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
+        mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
+        mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
+        vipRechargeAdapter.setEnableLoadMore(true);
+        vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
+        mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
+            new VipEditMenuDialog().show((BaseActivity) getActivity());
+        });
+        mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
+            pop();
+        });
+        onRefresh();
+    }
+
+    private void onLoadMore() {
+        mPresenter.rechargeorderQuery(mVip.getVipId(), pageNumber);
+        vipRechargeAdapter.setEnableLoadMore(false);
+    }
+
+    private void onRefresh() {
+        pageNumber = 0;
+        mPresenter.rechargeorderQuery(mVip.getVipId(), pageNumber);
+    }
+
+    @Override
+    public boolean onBackPressedSupport() {
+        pop();
+        return true;
+    }
+
+    public void setVipLevel(List<Level> levels) {
+        this.levels = levels;
+    }
+
+
+    public void setVip(Vip mVip) {
+        this.mVip = mVip;
+    }
+
+    public void getRechargeOrderSus(Pager<VipRechargeOrder> rechargeOrderPager) {
+        if (rechargeOrderPager.isFirstPage())
+        {
+            orders.clear();
+        }
+        if (rechargeOrderPager.getList().size() != 0) {
+            orders.addAll(rechargeOrderPager.getList());
+            vipRechargeAdapter.notifyDataSetChanged();
+            pageNumber = rechargeOrderPager.getPageNumber() + 1;
+        }
+        if (rechargeOrderPager.isLastPage()){
+            ToastUtils.showShort("没有更多数据");
+        }
+        vipRechargeAdapter.setEnableLoadMore(!rechargeOrderPager.isLastPage());
+        vipRechargeAdapter.loadMoreComplete();
+        mViewBinding.rechargeRefresh.setRefreshing(false);
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipSearchFragment.java

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+import android.annotation.SuppressLint;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import android.widget.TextView;
+
+import com.blankj.utilcode.util.KeyboardUtils;
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
+import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
+import com.xingdata.zzdpos.ui.settle.SettleActivity;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+import java.util.List;
+
+
+/**
+ * 会员搜索界面
+ */
+public class VipSearchFragment extends BaseFragment<SendTicketPresenter, FragmentSendTickerVipBinding> {
+    private VipAdapter mVipAdapter;
+    private BaseFragment baseFragment;
+
+    public void setBaseFragment(BaseFragment baseFragment) {
+        this.baseFragment = baseFragment;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_send_ticker_vip;
+    }
+
+    @Override
+    public void initView() {
+        mViewBinding.setEmpty(true);
+        mVipAdapter = new VipAdapter();
+        mViewBinding.rlVip.setAdapter(mVipAdapter);
+        mViewBinding.rlVip.setLayoutManager(new LinearLayoutManager(mContext));
+        @SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout
+                .view_empty, null);
+        ((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string
+                .settle_vip_search_empty);
+        mVipAdapter.setEmptyView(emptyView);
+
+        mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
+            if (baseFragment instanceof VipInfoFragment) {
+                ((VipInfoFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
+            }
+            startWithPop(baseFragment);
+        });
+        mViewBinding.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                switch (v.getId()) {
+                    case R.id.btn_back: {
+                        pop();
+                    }
+                    break;
+                    default: {
+
+                    }
+                    break;
+                }
+            }
+        });
+        mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
+            KeyboardUtils.hideSoftInput(textView);
+            mPresenter.searchVip(textView.getText().toString());
+            return false;
+        });
+
+    }
+
+    /**
+     * 加载会员信息
+     *
+     * @param vips 会员列表
+     */
+    public void loadVips(List<Vip> vips) {
+        mViewBinding.setEmpty(vips.size() == 0);
+        mVipAdapter.setNewData(vips);
+    }
+
+
+    @Override
+    public void onDestroyView() {
+        if (getActivity() instanceof SettleActivity) {
+            ((SettleActivity) getActivity()).showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        }
+        super.onDestroyView();
+    }
+}

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="20dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/yellow_bg" />
+
+    <solid android:color="@color/yellow_bg" />
+
+</shape>
\ No newline at end of file

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

@@ -40,6 +40,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout="@layout/view_ticket" />
+
+            <ViewStub
+                android:id="@+id/view_cs"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout="@layout/view_inventory_detail" />
         </FrameLayout>
 
         <LinearLayout

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+
+        <variable
+            name="cartCount"
+            type="int" />
+
+        <variable
+            name="result"
+            type="String" />
+
+    </data>
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/ll_title"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginTop="@dimen/all_margin"
+            android:background="@color/white_caocao"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+        </View>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/rl_cart" />
+
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_cart"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            app:layout_constraintBottom_toTopOf="@id/ll_info"
+            app:layout_constraintTop_toBottomOf="@id/ll_title" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/ll_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_info"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="结果："
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text='@{result}'
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_sub_title_size"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_ok"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/shape_red_round_rectangle_more_round"
+                android:foreground="?android:attr/actionBarItemBackground"
+                android:paddingBottom="@dimen/all_spacing"
+                android:paddingEnd="@dimen/all_margin_big"
+                android:paddingStart="@dimen/all_margin_big"
+                android:paddingTop="@dimen/all_spacing"
+                android:text="@string/inventory_add_btn_end"
+                android:textColor="@color/white_caocao" />
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/fl_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:animateLayoutChanges="true"
+            app:layout_constraintBottom_toBottomOf="@id/ll_title"
+            app:layout_constraintLeft_toLeftOf="parent">
+
+
+            <ImageView
+                android:id="@+id/iv_cart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/all_spacing"
+                android:contentDescription="@string/store_cart"
+                android:foreground="?attr/actionBarItemBackground"
+                android:src="@mipmap/shopping_cart" />
+
+            <TextView
+                android:layout_width="@dimen/store_cart_count"
+                android:layout_height="@dimen/store_cart_count"
+                android:layout_gravity="end"
+                android:background="@drawable/shape_white_oval"
+                android:gravity="center"
+                android:text='@{cartCount+""}'
+                android:textColor="@color/red_guanyu"
+                android:textSize="@{cartCount &lt; 100?@dimen/all_caption_size:@dimen/all_tiny_size}"
+                android:textStyle="bold" />
+        </FrameLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

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

@@ -89,7 +89,7 @@
         </LinearLayout>
 
         <TextView
-            android:id="@+id/tv_settle"
+            android:id="@+id/btn_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_margin"
@@ -112,7 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_margin_big"
             android:animateLayoutChanges="true"
-            app:layout_constraintBottom_toBottomOf="@id/tv_settle"
+            app:layout_constraintBottom_toBottomOf="@id/btn_end"
             app:layout_constraintLeft_toLeftOf="@id/fl_cart">
 
 

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

@@ -25,11 +25,11 @@
             android:orientation="horizontal">
 
             <ImageView
-                android:background="@mipmap/mk_grade01"
                 android:layout_width="wrap_content"
-                android:layout_marginLeft="@dimen/all_margin"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_height="wrap_content" />
+                android:layout_marginLeft="@dimen/all_margin"
+                android:background="@mipmap/mk_grade01" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -41,20 +41,22 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/vip_name"
                     style="@style/default_blacktext_bigstyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="张思" />
+                    android:layout_height="wrap_content" />
 
                 <TextView
-
-                    style="@style/default_blacktext_smallstyle"
+                    android:id="@+id/vip_mobile"
+                    style="@style/default_blacktext_nopadding_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="13311525312" />
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/black" />
             </LinearLayout>
 
             <TextView
+                android:id="@+id/vip_discount"
                 style="@style/default_blacktext_smallstyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -86,13 +88,14 @@
                     style="@style/default_blacktext_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="可用金額" />
+                    android:text="消费总额" />
 
                 <TextView
+                    android:id="@+id/expense_AMT"
                     style="@style/default_blacktext_bigstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="50.00"
+                    android:text="0.00"
                     android:textColor="@color/reddeep" />
             </LinearLayout>
 
@@ -112,13 +115,14 @@
                     style="@style/default_blacktext_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="可用金額" />
+                    android:text="消费次数" />
 
                 <TextView
+                    android:id="@+id/expense_Count"
                     style="@style/default_blacktext_bigstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="160.00"
+                    android:text="0.00"
                     android:textColor="@color/reddeep" />
             </LinearLayout>
         </LinearLayout>

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

@@ -209,15 +209,14 @@
         </LinearLayout>
 
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="bottom"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/onSure"
+                android:layout_alignParentBottom="true"
                 style="@style/button_positive_noradius"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -225,7 +224,7 @@
                 android:onClick="@{onClickListener}"
                 android:text="确认" />
 
-        </LinearLayout>
+        </RelativeLayout>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -13,9 +13,8 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="?attr/actionBarSize"
             android:orientation="horizontal">
-
             <include
                 android:id="@+id/title_search"
                 layout="@layout/title_search"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/info_title"
+            layout="@layout/title_pop" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/all_margin"
+                android:background="@mipmap/mk_grade01" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/vip_name"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/vip_mobile"
+                    style="@style/default_blacktext_nopadding_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/vip_discount"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/all_margin"
+                android:text="@string/vip_info_discount" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可用优惠卷" />
+
+                <TextView
+                    android:id="@+id/mscard_valid"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="40dp"
+                android:background="@color/line_bg"></View>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可用优惠卷" />
+
+                <TextView
+                    android:id="@+id/macard_invalid"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/recharge_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rechargeRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/info_title"
+            layout="@layout/title_pop" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/all_margin"
+                android:background="@mipmap/mk_grade01" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/vip_name"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/vip_mobile"
+                    style="@style/default_blacktext_nopadding_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/vip_discount"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/all_margin"
+                android:text="@string/vip_info_discount" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可用余额" />
+
+                <TextView
+                    android:id="@+id/recharge_AMT"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0.00"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="40dp"
+                android:background="@color/line_bg"></View>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="累计充值" />
+
+                <TextView
+                    android:id="@+id/recharge_amt"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0.00"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/recharge_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rechargeRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/all_padding_left_right"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@color/white_caocao"
         android:padding="@dimen/all_padding_left_right">
 
@@ -71,10 +72,8 @@
             android:id="@+id/tv_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:paddingEnd="@dimen/all_padding"
-            android:text=""
-            android:textColor="@color/black"
+            android:background="@drawable/singleline_white_gray"
+            android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_low"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_unit"
@@ -90,7 +89,7 @@
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintBottom_toBottomOf="@id/tv_unit"
-            app:layout_constraintEnd_toStartOf="@id/tv_unit"
+            app:layout_constraintEnd_toStartOf="@id/tv_num"
             app:layout_constraintStart_toStartOf="parent" />
 
 

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

@@ -8,7 +8,7 @@
 
         <variable
             name="count"
-            type="long" />
+            type="String" />
 
     </data>
 
@@ -41,6 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:text="@{count}"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />
 

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/all_padding"
+        android:paddingEnd="@dimen/dp_4"
+        android:paddingStart="@dimen/dp_4"
+        android:paddingTop="@dimen/all_padding"
+        android:weightSum="5">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="left"
+            android:paddingStart="@dimen/all_padding"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_small" />
+
+        <TextView
+            android:id="@+id/tv_stock_count"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_small" />
+
+
+        <TextView
+            android:id="@+id/tv_result_count"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_small" />
+
+        <ImageView
+            android:id="@+id/img_result"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@mipmap/icon_mark_equal" />
+
+
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginLeft="@dimen/all_margin"
+            android:layout_marginRight="@dimen/all_margin_left"
+            android:background="@color/line_bg" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/imgLeft"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginLeft="@dimen/all_margin_left"
+                android:layout_marginRight="@dimen/all_margin_left"
+                android:background="@mipmap/pay_rmb" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/expense_type"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="会员充值" />
+
+                <TextView
+                    android:id="@+id/expense_time"
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="08-09 10:10"
+                    android:textColor="@color/black_likui" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/expense_money"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0" />
+
+                <TextView
+                    android:id="@+id/expense_shop"
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="门店"
+                    android:textColor="@color/black_likui" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginLeft="@dimen/all_margin"
+            android:layout_marginRight="@dimen/all_margin_left"
+            android:background="@color/line_bg" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/imgLeft"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginLeft="@dimen/all_margin_left"
+                android:layout_marginRight="@dimen/all_margin_left"
+                android:background="@mipmap/pay_rmb" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/expense_type"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="会员充值" />
+
+                <TextView
+                    android:id="@+id/expense_time"
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="08-09 10:10"
+                    android:textColor="@color/black_likui" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/expense_money"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0" />
+
+                <TextView
+                    android:id="@+id/expense_shop"
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="门店"
+                    android:textColor="@color/black_likui" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_margin="@dimen/all_margin"
-            android:background="@mipmap/pay_alipay" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/rechange_type"
-                style="@style/default_blacktext_bigstyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="支付宝支付" />
-
-            <TextView
-                android:id="@+id/rechange_time"
-                style="@style/default_blacktext_smallstyle"
-                android:layout_width="wrap_content"
-                android:textColor="@color/black_likui"
-                android:layout_height="wrap_content"
-                android:text="08-09 10:10" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_margin="@dimen/all_margin"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/rechange_money"
-                style="@style/default_blacktext_bigstyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="+充值金额" />
-
-            <TextView
-                android:id="@+id/rechange_shop"
-                android:textColor="@color/black_likui"
-                style="@style/default_blacktext_smallstyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="充值总店" />
-        </LinearLayout>
-    </LinearLayout>
-
-</layout>
\ No newline at end of file

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

@@ -3,13 +3,13 @@
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
         android:background="@drawable/singleline_white_gray"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -26,6 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="0dp"
                 android:layout_weight="1"
+                android:imeOptions="actionSearch"
                 android:background="@color/listview_bg"
                 android:hint="请输入手机号或会员姓名" />
 

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

@@ -662,6 +662,7 @@
     <string name="statistics_order_detail_hint">订单详情</string>
     <string name="statistics_vip_recharge_hint">充值记录</string>
     <string name="statistics_used_ticket_hint">充值记录</string>
+    <string name="statistics_inventory_detail_hint">盘库结果</string>
     <!--商品详情POS-->
     <string name="oder_detail_date">交易时间:</string>
     <string name="oder_detail_no">订单号:</string>

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

@@ -44,6 +44,15 @@
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
 
+    <style name="default_blacktext_nopadding_smallstyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:padding">@dimen/dp_4</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">@dimen/detail_textview_size</item>
+    </style>
     <style name="default_blacktext_margin_smallstyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>