Merge remote-tracking branch 'origin/master'

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

-package com.xingdata.zzdpos.model;
-
-import com.xingdata.api.print.entity.BaseGoodPrint;
-import com.xingdata.api.print.entity.BaseOrderPrint;
-import com.xingdata.zzdpos.ui.login.LoginPresenter;
-import com.xingdata.zzdpos.util.ConvertUtil;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2017/12/15.
- */
-
-public class VipRechangeOrder implements BaseOrderPrint {
-    private Long cardAmtPay;
-    private Long cardAmtSend;
-    private Long rechangeBefore;
-    private Long rechangeAfter;
-    private String vipName;
-    private String rctraceNo;
-    private String vipMobile;
-    private Long createTime;
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCardAmtPay() {
-        return cardAmtPay;
-    }
-
-    public void setCardAmtPay(Long cardAmtPay) {
-        this.cardAmtPay = cardAmtPay;
-    }
-
-    public Long getCardAmtSend() {
-        return cardAmtSend;
-    }
-
-    public void setCardAmtSend(Long cardAmtSend) {
-        this.cardAmtSend = cardAmtSend;
-    }
-
-    public String getVipName() {
-        return vipName;
-    }
-
-    public void setVipName(String vipName) {
-        this.vipName = vipName;
-    }
-
-    public String getRctraceNo() {
-        return rctraceNo;
-    }
-
-    public void setRctraceNo(String rctraceNo) {
-        this.rctraceNo = rctraceNo;
-    }
-
-    public String getVipMobile() {
-        return vipMobile;
-    }
-
-    public void setVipMobile(String vipMobile) {
-        this.vipMobile = vipMobile;
-    }
-
-    public Long getRechangeBefore() {
-        return rechangeBefore;
-    }
-
-    public void setRechangeBefore(Long rechangeBefore) {
-        this.rechangeBefore = rechangeBefore;
-    }
-
-    public Long getRechangeAfter() {
-        return rechangeAfter;
-    }
-
-    public void setRechangeAfter(Long rechangeAfter) {
-        this.rechangeAfter = rechangeAfter;
-    }
-
-    public String getVipname() {
-        return vipName;
-    }
-
-    public void setVipname(String vipname) {
-        this.vipName = vipname;
-    }
-
-    @Override
-    public String getPayAmt() {
-        if (cardAmtSend!=null&&cardAmtSend!=0){
-            return ConvertUtil.fenToYuan(cardAmtPay,false)+"+"+ConvertUtil.fenToYuan(cardAmtSend,false);
-        }else {
-            return ConvertUtil.fenToYuan(cardAmtPay,false);
-        }
-
-    }
-    @Override
-    public String getVip_money() {
-        return ConvertUtil.fenToYuan(getRechangeAfter(),false);
-    }
-
-    @Override
-    public String getBalanceOld() {
-        return ConvertUtil.fenToYuan(getRechangeBefore(),false);
-    }
-
-    @Override
-    public String getTitle() {
-        return LoginPresenter.loginReturnBean.getMerNameAbcn();
-    }
-
-    @Override
-    public String getStore() {
-        return LoginPresenter.loginReturnBean.getShopNameAbcn();
-    }
-
-    @Override
-    public String getOrderNo() {
-        return rctraceNo;
-    }
-
-    @Override
-    public String getOrderTime() {
-        return com.blankj.utilcode.util.TimeUtils.millis2String(createTime);
-    }
-
-    @Override
-    public String getCasherName() {
-        return LoginPresenter.loginReturnBean.getOperName();
-    }
-
-    @Override
-    public String getUserName() {
-        return vipName+"("+vipMobile.substring(vipMobile.length()-4)+")";
-    }
-
-
-    @Override
-    public String getPayChannel() {
-        return null;
-    }
-
-    @Override
-    public String getPayChange() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsCnt() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsAmtSum() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsReduPer() {
-        return null;
-    }
-
-    @Override
-    public String getGoodsReduAmt() {
-        return null;
-    }
-
-    @Override
-    public List<BaseGoodPrint> getGoodList() {
-        return null;
-    }
-
-    @Override
-    public String getDRAW_URL() {
-        return null;
-    }
-
-    @Override
-    public String getPrint_state() {
-        return null;
-    }
-
-    @Override
-    public String getOper_mobile() {
-        return null;
-    }
-
-
-    @Override
-    public String getStore_tel() {
-        return null;
-    }
-
-    @Override
-    public String getSupplier() {
-        return null;
-    }
-}

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

@@ -122,7 +122,7 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
     @Override
     public String getPayAmt() {
         if (cardAmtSend != null && cardAmtSend != 0) {
-            return ConvertUtil.fenToYuan(cardAmtPay, false) + "+" + ConvertUtil.fenToYuan(cardAmtSend, false);
+            return ConvertUtil.fenToYuan(cardAmtPay, false) + "（赠：" + ConvertUtil.fenToYuan(cardAmtSend, false) + "）";
         } else {
             return ConvertUtil.fenToYuan(cardAmtPay, false);
         }

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

@@ -45,15 +45,11 @@ public class RechargeListFragment extends BaseFragment<StatisticsPresenter, Frag
 
 
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_recharge);
-        if (mStatisticsGroupAdapter == null) {
+
             mStatisticsGroupAdapter = new StatisticsRechargeGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
-        }
 
         mStatisticsGroupAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

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

@@ -45,15 +45,11 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
         pagerNum = 1;
 
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty_ticket);
-        if (mStatisticsGroupAdapter == null) {
-            mStatisticsGroupAdapter = new StatisticsTicketGroupAdapter(new ArrayList<>());
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
-        }
+        mStatisticsGroupAdapter = new StatisticsTicketGroupAdapter(new ArrayList<>());
+        mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.statisticsRecycler.setAdapter(mStatisticsGroupAdapter);
+
 
         mStatisticsGroupAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override

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

@@ -80,15 +80,12 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
 //        });
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
 
-        if (mStatisticsAdapter == null) {
+
             mStatisticsAdapter = new StatisticsOrderGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
 
-        } else {
-            mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
-        }
+
 
         mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override