浏览代码

fix(SCRM-3750): incident--临时停车微服务。CRM停车券在使用中叠加问题

john 2 年之前
父节点
当前提交
789f7a7f05
共有 2 个文件被更改,包括 63 次插入10 次删除
  1. 62 10
      src/api/mockData/checkout.qh10.response.json
  2. 1 0
      src/pages/parkingFee/mixins/parkingFeeCoupon.js

+ 62 - 10
src/api/mockData/checkout.qh10.response.json

@@ -1,21 +1,21 @@
 {
   "parkingRecord": {
-    "vehicleNo": "粤Q55568",
-    "enterTime": "2023-05-14 08:15:16",
-    "serviceMin": 180,
+    "vehicleNo": "闽RRRRRY",
+    "enterTime": "2023-05-14 06:28:11",
+    "serviceMin": 300,
     "totalFee": 10000,
-    "actualPayFee": 80,
-    "thirdPartyId": "7336c4267f0b4d669e3c1085627e803b",
-    "thirdParkOrderNo": "ccd4bf470fe148fbbeddf88156005acd",
+    "actualPayFee": 45,
+    "thirdPartyId": "bc936575706640cea678c7c320051718",
+    "thirdParkOrderNo": "690bbf8b3fdf49ab888e929373e7ea88",
     "createdByQrCode": false,
     "totalFeeInYuan": 100
   },
   "discountInfo": {
-    "usingTotalDiscount": 20,
+    "usingTotalDiscount": 55,
     "memberLevelDiscount": false,
     "points": [
       {
-        "available": 11790,
+        "available": 4410,
         "maxDiscountFee": 20,
         "pointsPerUnit": 50,
         "unitAmount": 5,
@@ -24,15 +24,67 @@
         "discountFee": 20,
         "unlimitUsePoints": "LIMIT"
       }
+    ],
+    "coupons": [
+      {
+        "code": "bghhx92keb9_t",
+        "couponId": "96c84681fb5c4fd38e3043fab5371964",
+        "name": "首2小时停车券(测试)",
+        "expirationDate": "2023-05-12 23:59:59",
+        "discountFee": 20,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 1
+      },
+      {
+        "code": "d3jbhhnh624_t",
+        "couponId": "96c84681fb5c4fd38e3043fab5371964",
+        "name": "首2小时停车券(测试)",
+        "expirationDate": "2023-05-12 23:59:59",
+        "discountFee": 20,
+        "defaultSelected": false,
+        "superposition": "2",
+        "limitCountPerOrder": 1
+      },
+      {
+        "code": "i26z1cf0vvm_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券(周末及法定节假日)",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
+      {
+        "code": "g9ar30c6cpe_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券(周末及法定节假日)",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
+      {
+        "code": "gw2goi8lgzx_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券(周末及法定节假日)",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      }
     ]
   },
   "parkingRule": {
     "maxOneDayDiscountFee": 60,
     "enableNewMemberPoints": false,
     "enablePoints": true,
-    "enableCoupon": false,
+    "enableCoupon": true,
     "enablePaperCoupons": false,
-    "maxPointsTime": 255,
+    "maxPointsTime": 101,
     "enableConsume": false,
     "enableConsumeSplit": false,
     "availableDiscountFee": 60,

+ 1 - 0
src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -120,6 +120,7 @@ export default {
       if (!item.disabled) {
         this.checkedCouponList.push(`coupon${index}`);
       }
+      this.newGroupedCouponData()
     },
     // 对不同类型的优惠券进行汇总统计
     /*groupedCouponData() {