From 53c5d1a4e3a934c1fd2ce5accfe47c136207e204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B1=BC=E5=B9=B2?= <1810377322@163.com>
Date: Sun, 29 Sep 2024 09:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D3=E4=B8=AABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuint/common/service/impl/OrderServiceImpl.java |  9 ++++++++-
 .../common/service/impl/UserCouponServiceImpl.java  |  2 +-
 XinAoDTS/fuintUniapp/pages/order/index.vue          | 13 +++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java b/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
index a2afa87..fe40b23 100644
--- a/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
+++ b/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);
diff --git a/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java b/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java
index 969f9a1..396076f 100644
--- a/XinAoDTS/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java
+++ b/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());
                 }
 
diff --git a/XinAoDTS/fuintUniapp/pages/order/index.vue b/XinAoDTS/fuintUniapp/pages/order/index.vue
index 4e6f04e..d4549f4 100644
--- a/XinAoDTS/fuintUniapp/pages/order/index.vue
+++ b/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: {