Переглянути джерело

fix(KIP-10514): 【DE】【C端】【静安】。消费减免的”+“号在用户没有5小时减免时,仍可以增加到5小时减免。

john 2 роки тому
батько
коміт
adb77732f5

+ 62 - 0
src/api/mockData/checkout.pd14.response.json

@@ -0,0 +1,62 @@
+{
+  "parkingRecord": {
+    "vehicleNo": "沪D10001",
+    "enterTime": "2023-05-17 15:53:00",
+    "serviceMin": 27112,
+    "totalFee": 4000,
+    "actualPayFee": 16,
+    "thirdParkOrderNo": "4970728",
+    "createdByQrCode": false,
+    "totalFeeInYuan": 40
+  },
+  "discountInfo": {
+    "usingTotalDiscount": 24,
+    "memberLevelDiscount": false,
+    "consume": [
+      {
+        "defaultSelected": true,
+        "defaultDiscountTime": 10,
+        "discountFee": 24,
+        "redeemSalesAmount": 600,
+        "couponCodes": "0jv2pvambb3_t#8vr1b9wdbli_t#q2q9tqk9fjn_t#b5mkwsc4yag_t#8wl0qimifpi_t#ltvnf11f91l_t#01wn30uhezy_t#ljw41t7natw_t#x2rvzaj44e1_t#p62cmqrlhtk_t"
+      }
+    ],
+    "points": [
+      {
+        "available": 11798,
+        "pointsPerUnit": 1200,
+        "unitAmount": 12,
+        "totalAvailable": 11798,
+        "unitHour": 1,
+        "newMember": false,
+        "label": "11798积分可减免"
+      }
+    ],
+    "paperCoupons": [
+      {
+        "description": "纸质优惠券不限制会员使用。"
+      }
+    ]
+  },
+  "parkingRule": {
+    "maxOneTimeDiscountTime": 2,
+    "enableNewMemberPoints": false,
+    "enablePoints": true,
+    "unLimitWeekendPoints": false,
+    "enableCoupon": true,
+    "enablePaperCoupons": true,
+    "enableConsume": true,
+    "enableConsumeSplit": false,
+    "maxConsumeTime": 10,
+    "remainConsumeTime": 10,
+    "hourPrice": 12,
+    "oneTimeLimitation": true,
+    "oneDayLimitation": false
+  },
+  "parkInfo": {
+    "parkName": "浦东嘉里城",
+    "description": "12元/小时。8-24小时封顶96元。纸质优惠券不限制使用数量。每次最多优惠2小时。积分兑换停车费用1200积分=1小时。积分商城售卖停车电子券的使用类型。单日累计消费满300元赠送1张消费600元赠2张1小时的停车券,不重复发券,消费跨天不累计,",
+    "parkMallCode": 1,
+    "buildingId": "184-100035"
+  }
+}

+ 1 - 1
src/pages/parkingFee/mixins/parkingFeeDiscounts.js

@@ -242,7 +242,7 @@ export default {
         return [true, (maxOneDayDiscountFee - (this.reduceHours - 1) * hourPrice) / hourPrice];
       }
       // 单次上限限制
-      if (oneTimeLimitation && this.remainPrice > maxOneTimeDiscountFee) {
+      if (oneTimeLimitation && this.remainPrice >= maxOneTimeDiscountFee) {
         Toast({
           message: `超出抵扣上限,每次最高可抵扣${maxOneTimeDiscountTime}小时`,
           icon: 'none',