Merge remote-tracking branch 'origin/master'

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/manage/user/UserActivity.java

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.user;
 
 import android.view.MotionEvent;
 
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityUserBinding;
@@ -40,7 +41,9 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
     }
 
     @Override
-    public void updateUserSus(Oper oper) {
+    public void updateUserSus(Oper oper)
+    {
+        ToastUtils.showShort("修改成功");
         mPresenter.userListFragment.updateUserSus(oper);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java

@@ -106,6 +106,8 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
     }
 
     public void updateUserSus(Oper oper) {
+        mPresenter.userInfoEditFragment.pop();
+        mPresenter.userInfoFragment.pop();
         onRefresh();
     }
 

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);
     }

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

@@ -245,4 +245,11 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
 
     }
 
+    @Override
+    public void onStop() {
+        mViewBinding.edTitle.setText("");
+        super.onStop();
+
+    }
+
 }

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

@@ -21,7 +21,7 @@ import java.util.List;
 public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBinding> {
     private Context mContext;
     private String shopName;
-    
+
 
 
     public VipTruleAdapter(Context mContext, @Nullable List<Ticket> data) {

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

@@ -116,7 +116,7 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
         inValid=0;
 
         for (Ticket t : tickets) {
-            if (t.getUsedFlag().toString().equals("1")) {
+            if (t.getUsedFlag().toString().equals("1")&&t.getTruleStatus().toString().equals("0")) {
                 valid = valid + 1;
             } else {
                 inValid = inValid + 1;

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -58,7 +58,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "test2019";
+        return "test2018";
     }
 
     /**