修复3个BUG

XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -200,11 +200,18 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
         if (dataType.equals("toPay")) {
             status = OrderStatusEnum.CREATED.getKey(); // 待支付
+            orderMode="";
         } else if(dataType.equals("paid")) {
-            status = "";
             payStatus = PayStatusEnum.SUCCESS.getKey(); // 已支付
+            orderMode="";
         } else if(dataType.equals("cancel")) {
             status = OrderStatusEnum.CANCEL.getKey();  // 已取消
+            orderMode="";
+        }else if(dataType.equals("delivered")) {
+            orderMode="";
+            status = OrderStatusEnum.DELIVERED.getKey();  // 已取消
+        }else if(dataType.equals("all")) {
+            orderMode="" ;
         }
 
         Page<MtOpenGift> pageHelper = PageHelper.startPage(pageNumber, pageSize);

XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -500,7 +500,7 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
                 // 计次卡tips
                 if (couponInfo.getType().equals(CouponTypeEnum.TIMER.getKey())) {
                     Long confirmNum = confirmLogService.getConfirmNum(userCouponDto.getId());
-                    tips = "已使用"+ confirmNum +"次，可使用" + couponInfo.getOutRule() + "次";
+                    tips = "已使用"+ confirmNum +"次，可使用" + (Integer.valueOf(couponInfo.getOutRule())-confirmNum) + "次";
                     dto.setNum(Integer.parseInt(couponInfo.getOutRule()) - confirmNum.intValue());
                 }
 

XinAoDTS/fuintUniapp/pages/order/index.vue

@@ -94,7 +94,9 @@
   const tabs = [{
     name: `全部`,
     value: 'all'
-  }, {
+  }
+
+  , {
     name: `待支付`,
     value: 'toPay'
   }, {
@@ -103,7 +105,14 @@
   }, {
     name: `已取消`,
     value: 'cancel'
-  }]
+  }
+    , {
+   name: `已发货`,
+   value: 'delivered'
+ }
+
+
+  ]
 
   export default {
     components: {