Merge branch 'John/release-2.12.0/KIP-10830' of git.kerryprops.com.cn:John-Hong/temporary-parking-h5 into John/release-2.12.0/KIP-10830

src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -76,7 +76,7 @@ export default {
        * */
       this.couponList = [...this.coupons];
       this.remainPrice = this.usingTotalDiscount;
-      if (this.parkMallCode === 4 && this.orderDetail?.discountInfo?.points[0]?.discountFee) {
+      if ((this.parkMallCode === 4 || this.parkMallCode === 6) && this.orderDetail?.discountInfo?.points[0]?.discountFee) {
         this.remainPrice = this.remainPrice - this.orderDetail.discountInfo.points[0].discountFee
       }   
       // 如果前海开启无积分上限的话，则
@@ -108,7 +108,7 @@ export default {
           // 验证剩余优惠券是否可勾选(无需验证：后端已计算可勾选的优惠券)
           this.newGroupedCouponData()
           this.setAllDisabled()
-          if (this.parkMallCode === 4) {
+          if (this.parkMallCode === 4 || this.parkMallCode === 6) {
             this.isDisabledByRule(this.couponList[0], 0, 'showMsg');
           }          
         })

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -193,7 +193,7 @@ export default {
             "defaultSelected": selected,
             "discountTime": discountTime,
             "discountFee": discountFee,
-            "redeemSalesAmount": this.parkMallCode === 4 ? (redeemSalesAmount / defaultDiscountTime) * ( discountFee / hourPrice) : redeemSalesAmount
+            "redeemSalesAmount": (this.parkMallCode === 4 || this.parkMallCode === 6) ? (redeemSalesAmount / defaultDiscountTime) * ( discountFee / hourPrice) : redeemSalesAmount
           }
         }
         

src/pages/parkingFee/mixins/parkingFeeDiscounts.js

@@ -66,7 +66,7 @@ export default {
       return 1
     },
     stepperMax() {
-      if (this.parkMallCode === 4) {
+      if (this.parkMallCode === 4 || this.parkMallCode === 6) {
         // 如果存在消费减免并且是可拆分的，则设置最低拆分单位是 1
         return this.maxReduceDiscount
       }
@@ -189,7 +189,7 @@ export default {
     },
     checkedList(newVal, oldVal) {
       // console.log(190, { newVal, oldVal });
-      if (this.parkMallCode === 4 && this.isInit > 1) {
+      if ((this.parkMallCode === 4 || this.parkMallCode === 6) && this.isInit > 1) {
         const { maxOneDayCoupons, maxonedaydiscountFee, maxOneTimeDiscountTime, remainConsumeTime, hourPrice, oneTimeLimitation, oneDayLimitation, maxOneDayDiscountFee } = this.orderDetail.parkingRule;
         // 会员等级选中了
         if (newVal.indexOf('member') > -1 && oldVal.indexOf('member') < 0) {
@@ -276,7 +276,7 @@ export default {
       }, 300)
     },
     discountInit() {
-      if(this.parkMallCode === 4 ) {
+      if(this.parkMallCode === 4 || this.parkMallCode === 6 ) {
         const { maxConsumeTime, remainConsumeTime, hourPrice } = this.orderDetail.parkingRule;
         const remainingLimitToIncrease = Math.abs(this.remainPrice - this.availableDiscountFee) / hourPrice
         if(!remainingLimitToIncrease) {
@@ -357,23 +357,23 @@ export default {
         this.remainPrice = this.memberGrade.discountFee + this.remainPrice;
         // console.log(331, this.remainPrice);
         // 沈阳
-        if (this.parkMallCode === 4) {
+        if (this.parkMallCode === 4 || this.parkMallCode === 6) {
           // console.log(322);
           this.maxReduceDiscountInit();
         }
       } else if (!this.isMember) {
         this.remainPrice = this.remainPrice - this.memberGrade.discountFee;
         // 如果不是沈阳，重新计算优惠
-        if (this.parkMallCode !== 4) {
+        if (this.parkMallCode !== 4 && this.parkMallCode !== 6) {
           this.maxReduceDiscount = remainConsumeTime;
         }
         // 如果不是沈阳，重新计算优惠
-        if (this.parkMallCode === 4) {
+        if (this.parkMallCode === 4 || this.parkMallCode === 6) {
           this.maxReduceDiscountInit();
         }
       }
       // 如果不是沈阳
-      if (this.parkMallCode !== 4) {
+      if (this.parkMallCode !== 4 && this.parkMallCode !== 6) {
         const [isCrossMessage = false, maxReduceDiscount = this.maxReduceDiscount] = this.crossMessage();
         if (isCrossMessage) {
           this.checkedList = this.checkedList.filter((elm) => elm !== 'member');
@@ -388,19 +388,19 @@ export default {
       if (this.checkedList.indexOf('reduces') > -1) {
         // this.remainPrice = hourPrice + this.remainPrice;
         // 如果不是沈阳，重新计算计算最大上限
-        if (this.parkMallCode !== 4) {
+        if (this.parkMallCode !== 4 && this.parkMallCode !== 6) {
           this.remainPrice = hourPrice + this.remainPrice;
           this.maxReduceDiscount = remainConsumeTime > maxOneTimeDiscountFee / hourPrice ? maxOneTimeDiscountFee / hourPrice : remainConsumeTime;
         }
       } else {
         // this.remainPrice = this.remainPrice - hourPrice;
         // 如果不是沈阳，重新计算计算最大上限
-        if (this.parkMallCode !== 4) {
+        if (this.parkMallCode !== 4 && this.parkMallCode !== 6) {
           this.remainPrice = this.remainPrice - hourPrice;
           this.maxReduceDiscount = remainConsumeTime > maxOneTimeDiscountFee / hourPrice ? maxOneTimeDiscountFee / hourPrice : remainConsumeTime;
         }
       }
-      if (this.parkMallCode !== 4) {
+      if (this.parkMallCode !== 4 && this.parkMallCode !== 6) {
         const [isCrossMessage = false, maxReduceDiscount = 0] = this.crossMessage();
         if (isCrossMessage) {
           this.remainPrice = this.remainPrice - maxReduceDiscount * hourPrice;

src/store/order/points.js

@@ -104,7 +104,7 @@ export default {
   },
   // 积分减免
   pointsMath( {commit,dispatch,state},{type,callback} ) {
-    const {parkInfo,parkingRule} = state.orderDetail
+    const {parkInfo,parkingRule,parkingRecord} = state.orderDetail
     const {maxOneTimeDiscountTime,oneTimeLimitation,oneDayLimitation,hourPrice,remainConsumeTime, maxOneDayDiscountFee} = parkingRule
     const {parkMallCode} = parkInfo
     console.log(376,maxOneTimeDiscountTime,state.availableDiscountFee)
@@ -173,6 +173,10 @@ export default {
     // if ( type === 'add' && state.usingTotalDiscount >= state.availableDiscountFee && parkMallCode === 5 && !state.unLimitWeekendPoints) {
     //   return;
     // }
+    // 如果天津的积分参与的抵扣金额大于等于当前车辆的总的停车费用，则阻止用户继续使用积分
+    if(parkMallCode === 6 && state?.usingTotalDiscount>= parkingRecord?.totalFeeInYuan) {
+      return
+    }
     if ( type === 'add' ) {
       // 如果天津的积分参与的抵扣金额大于等于当前车辆的总的停车费用，则阻止用户继续使用积分
       // if(parkMallCode === 6 && state?.usingTotalDiscount>= parkingRecord?.totalFeeInYuan) {