优惠券修改;

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

@@ -390,7 +390,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
         //优惠券
         if (ticket != null && ticket.getTruleOrderAmt() > getOrderPayAmt()) this.ticket = null;
-        this.ticketId = ticket == null ? -1L : ticket.getTicketNo();
+        this.ticketId = ticket == null ? -1L : ticket.getId();
         this.ticketAmt = ticket == null ? 0L : ticket.getTicketValAmt();
         this.ticketNum = ticket == null ? (byte) 0 : (byte) 1;
         //用券后金额

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

@@ -32,6 +32,7 @@ public class Ticket implements BaseBean {
 
     @Deprecated
     public Ticket(Long l) {
+        this.id = l;
         this.ticketNo = l;
         this.ticketValAmt = 0L;
         this.truleOrderAmt = 0L;

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

@@ -19,11 +19,6 @@ import java.util.List;
 import io.reactivex.Observable;
 
 public class SettlePresenter extends SettleContract.Presenter {
-
-    /**
-     * 当前的使用的支付方式
-     */
-    private int mPayType;
     /**
      * 结算模式
      */
@@ -220,28 +215,23 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInCash(Long inputAmt, Long changeAmt) {
-        this.mPayType = C.PAY_CHANNEL.CASH;
         subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CASH))));
     }
 
     @Override
     public void payInAli(String payCode) {
-        this.mPayType = C.PAY_CHANNEL.ALI;
     }
 
     @Override
     public void payInWechat(String payCode) {
-        this.mPayType = C.PAY_CHANNEL.WECHAT;
     }
 
     @Override
     public void payInBank() {
-        this.mPayType = C.PAY_CHANNEL.BANK;
     }
 
     @Override
     public void payInCard(Long cardNo, String password) {
-        this.mPayType = C.PAY_CHANNEL.CARD;
         ApiFactory.Recard.checkPwd(mVip.getVipId(), String.valueOf(cardNo), password).subscribe(
                 b -> {
                     mView.dismissPasswordDialog();
@@ -253,7 +243,6 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInTally() {
-        this.mPayType = C.PAY_CHANNEL.TALLY;
     }
 
     @Override
@@ -381,37 +370,33 @@ public class SettlePresenter extends SettleContract.Presenter {
         mSaleorder.settle();
         mView.loadSaleorder(mSaleorder);
     }
+
     /**
      * 更新交班信息
      */
     private void updateHandover(HandoverInfo handoverInfo) {
         getRealm().beginTransaction();
         handoverInfo.setSumOrder(handoverInfo.getSumOrder() + 1);
-        switch (mPayType) {
+        switch (mSaleorder.getPayType()) {
             case C.PAY_CHANNEL.CASH:
                 handoverInfo.setCash(handoverInfo.getCash() + mSaleorder.getOrderPayAmt());
-                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
-                        .getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder.getOrderPayAmt());
                 break;
             case C.PAY_CHANNEL.WECHAT:
                 handoverInfo.setWechat(handoverInfo.getWechat() + mSaleorder.getOrderPayAmt());
-                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
-                        .getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder.getOrderPayAmt());
                 break;
             case C.PAY_CHANNEL.ALI:
                 handoverInfo.setAlipay(handoverInfo.getAlipay() + mSaleorder.getOrderPayAmt());
-                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
-                        .getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder.getOrderPayAmt());
                 break;
             case C.PAY_CHANNEL.BANK:
                 handoverInfo.setPos(handoverInfo.getPos() + mSaleorder.getOrderPayAmt());
-                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
-                        .getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder.getOrderPayAmt());
                 break;
             case C.PAY_CHANNEL.CARD:
                 handoverInfo.setVip(handoverInfo.getVip() + mSaleorder.getOrderPayAmt());
-                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
-                        .getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder.getOrderPayAmt());
                 break;
             case C.PAY_CHANNEL.TALLY:
                 break;

app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/TicketAdapter.java

@@ -27,7 +27,7 @@ public class TicketAdapter extends BaseAdapter<Ticket, ItemSettleTicketBinding>
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyy-mm-dd", Locale.getDefault()))));
+                TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
         mViewBinding.ivSelected.setImageResource(item.isSelected() ? R.mipmap.but_elect01 : R.mipmap.but_elect02);
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

@@ -48,7 +48,6 @@ public class StorePresenter extends StoreContract.Presenter {
         mSaleorder = new Saleorder();
 
         mOnApplyListener = new Ms.OnApplyListener() {
-
             @Override
             public void setDis(Ms ms) {
                 mSaleorder.addMsDis(ms);
@@ -221,7 +220,6 @@ public class StorePresenter extends StoreContract.Presenter {
                         mMss.get(i).setOnApplyListener(mOnApplyListener);
                     }
                     mView.loadMss(mMss);
-                }, throwable -> {
                 })
         );
     }