Merge pull request #187 from John-Hong/John/release-2.12.0/KIP-10892

John/release 2.12.0/kip 10892

src/api/mockData/checkout.hz4.response.json

@@ -0,0 +1,152 @@
+{
+    "parkingRecord": {
+      "vehicleNo": "鲁A10001", 
+      "enterTime": "2023-06-13 10:50:08", 
+      "serviceMin": 24836, 
+      "totalFee": 5000, 
+      "actualPayFee": 0, 
+      "thirdPartyId": "_1_29bcc3e1_1688114804262", 
+      "thirdParkOrderNo": "29bcc3e1b5b64aec9ad0213e7dd0fd65", 
+      "createdByQrCode": false, 
+      "totalFeeInYuan": 50
+    }, 
+    "discountInfo": {
+      "usingTotalDiscount": 80, 
+      "memberLevelDiscount": true, 
+      "memberGrade": [
+        {
+          "defaultSelected": true, 
+          "memberGrade": "3", 
+          "memberGradeText": "铂金卡", 
+          "discountTime": 4, 
+          "discountFee": 40
+        }
+      ], 
+      "consume": [
+        {
+          "defaultSelected": true, 
+          "maxDiscountTime": 2, 
+          "defaultDiscountTime": 4, 
+          "discountFee": 40, 
+          "redeemSalesAmount": 400
+        }
+      ], 
+      "coupons": [
+        {
+          "code": "3kywfljbbqe_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "310ia9b7lzo_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "zbh3xkmjhtn_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "vouvwoaqs72_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "1q4ynh60yff_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "b7in3if3d6k_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "olcutlmm2b8_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }, 
+        {
+          "code": "vj160la3aot_t", 
+          "couponId": "c52f5e3c5bb44b29a53c49c0a93eb47e", 
+          "status": "available", 
+          "name": "停车券(可叠加券)", 
+          "expirationDate": "2023-06-30 23:59:59", 
+          "discountFee": 10, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 7
+        }
+      ], 
+      "paperCoupons": [
+        {
+          "description": "请扫描纸质停车优惠券二维码，获取停车优惠"
+        }
+      ]
+    }, 
+    "parkingRule": {
+      "enableNewMemberPoints": false, 
+      "enablePoints": false, 
+      "unLimitWeekendPoints": false, 
+      "enableCoupon": true, 
+      "maxOneDayCoupons": 5, 
+      "remainCoupons": 5, 
+      "enablePaperCoupons": true, 
+      "enableConsume": true, 
+      "enableConsumeNonSplit": true, 
+      "maxConsumeTime": 6, 
+      "remainConsumeTime": 2, 
+      "hourPrice": 10, 
+      "oneTimeLimitation": false, 
+      "oneDayLimitation": false
+    }, 
+    "parkInfo": {
+      "parkName": "杭州嘉里中心", 
+      "description": "基础计费规则：10元/小时\n会员权益减免：铂金卡4小时，金卡2小时，臻选银卡1小时，每日限享优惠权益1次，不可拆分使用，可与消费抵免叠加使用。\n会员消费减免：消费200元可减免2小时，消费400元可减免4小时，消费800元及以上可减免6小时，当日有效，单次获得的减免不可拆分使用，当日最多可享受消费减免6小时。", 
+      "parkMallCode": 2, 
+      "buildingId": "HKC-P1"
+    }
+  }

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -193,7 +193,8 @@ export default {
             "defaultSelected": selected,
             "discountTime": discountTime,
             "discountFee": discountFee,
-            "redeemSalesAmount": (this.parkMallCode === 4 || this.parkMallCode === 6) ? (redeemSalesAmount / defaultDiscountTime) * ( discountFee / hourPrice) : redeemSalesAmount
+            // 杭州，沈阳，天津，福州，重新计算 redeemSalesAmount
+            "redeemSalesAmount": ([2,4,6,8].indexOf(this.parkMallCode) > -1) ? (redeemSalesAmount / defaultDiscountTime) * ( discountFee / hourPrice) : redeemSalesAmount
           }
         }
         

src/store/order/index.js

@@ -1,4 +1,4 @@
-import checkOutQHResponse from "@/api/mockData/checkout.sy5.response.json";
+import checkOutQHResponse from "@/api/mockData/checkout.hz4.response.json";
 import { checkOut,calculateDiscount,ordersAndPrepay,currentUnlicensedPlate,unlicensedCarCheckIn,unlicensedCarCheckout } from '@/api/parking';
 import state from "@/store/order/state";
 import mutations from "@/store/order/mutations";

src/store/order/memberLevel.js

@@ -24,6 +24,23 @@ export default {
           checkedTotal++;
         }
       });
+      
+      // start 当用户产生消费减免，在当天做了1 次以上的停车缴费，并再次产生消费减免的情况下，重置 discountFee, 仅在第一次加载时生效（杭州、福州），
+      const {parkingRule, discountInfo} = orderDetail
+      const {usingTotalDiscount} = discountInfo
+      const {hourPrice} = parkingRule
+      const [consume] = [...orderDetail.discountInfo.consume]
+      if (
+        (orderDetail.parkInfo.parkMallCode === 2 || orderDetail.parkInfo.parkMallCode === 8) && 
+        consume.maxDiscountTime <  consume.defaultDiscountTime && // 修改时机
+        consume.maxDiscountTime * hourPrice !== consume.discountFee // 阻止二次修改
+      ) {
+        consume.discountFee = consume.maxDiscountTime * hourPrice
+        orderDetail.discountInfo.consume = [consume]
+        orderDetail.discountInfo.usingTotalDiscount = usingTotalDiscount - (consume.defaultDiscountTime - consume.maxDiscountTime) * hourPrice
+        commit('setOrderDetail', orderDetail)
+      }
+      // end
     }
     commit('setCheckedTotal',checkedTotal);
     dispatch('getDiscountDesc',{