加入优惠券规则状态和使用状态的判断;

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

@@ -649,4 +649,15 @@ public class C {
     public final class SYSTEM {
         public static final String DIALOGISDISMISS = "DIALOGISDISMISS";
     }
+
+    public final class TRULE_STATUS {
+        public static final int NORMAL = 0;
+        public static final int INVALID = 1;
+    }
+
+    public final class TICKET_USED_FLAG {
+        public static final int NORMAL = 1;
+        public static final int USED = 2;
+        public static final int INVALID = 3;
+    }
 }

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

@@ -15,7 +15,6 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
@@ -190,7 +189,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void searchTicket() {
         List<Ticket> _tickets = new ArrayList<>();
         for (int i = 0; i < mTickets.size(); i++) {
-            if (mSaleorder.getOrderVipOffAmt() - mSaleorder.getMsDisAmt() >= mTickets.get(i).getTruleOrderAmt()) {
+            if (mSaleorder.getOrderVipOffAmt() - mSaleorder.getMsDisAmt() >= mTickets.get(i).getTruleOrderAmt() && mTickets.get(i).getTruleStatus() == C.TRULE_STATUS.NORMAL && mTickets.get(i).getUsedFlag() == C.TICKET_USED_FLAG.NORMAL) {
                 mTickets.get(i).setSelected(mSaleorder.getTicketId() == mTickets.get(i).getTicketNo());
                 _tickets.add(mTickets.get(i));
             }
@@ -300,7 +299,6 @@ public class SettlePresenter extends SettleContract.Presenter {
 //                            }
 //                        },
 //                        throwable -> mView.showPayFailFragment(throwable, mSaleorder));
-
         //提交订单
         commitOrder(
         ).flatMap(orderNo -> {
@@ -555,8 +553,9 @@ public class SettlePresenter extends SettleContract.Presenter {
     private void searchAvlTicket() {
         int avlTicketNum = 0;
         for (int i = 0; i < mTickets.size(); i++) {
-            if (mTickets.get(i).getTruleOrderAmt() <= mSaleorder.getOrderPayAmt())
+            if (mSaleorder.getOrderVipOffAmt() - mSaleorder.getMsDisAmt() >= mTickets.get(i).getTruleOrderAmt() && mTickets.get(i).getTruleStatus() == C.TRULE_STATUS.NORMAL && mTickets.get(i).getUsedFlag() == C.TICKET_USED_FLAG.NORMAL) {
                 avlTicketNum++;
+            }
         }
         mView.loadAvlTicketNum(avlTicketNum);
     }