Merge pull request #596 from John-Hong/John/release-3.18.0/SCRM-7383

fix(SCRM-7383): 优惠金额展示优化

src/pages/parkingFeeV2/Discounts/index.js

@@ -246,6 +246,12 @@ export default {
       if (this.paperDiscountFee) {
         this.remainPrice = this.remainPrice - this.paperDiscountFee;
       }
+      // 如果存在第三方车场优惠
+      const {parkDiscount = 0} = this.orderDetail.parkingRecord
+      if(parkDiscount) {
+        this.remainPrice = this.remainPrice - parkDiscount;
+      }
+
       this.memberGrade = { ...memberGrade[0] };
       this.consume = { ...consume[0] };
       if (JSON.stringify(this.memberGrade) !== '{}' && this.memberGrade && this.memberGrade.hasOwnProperty('selected') ? this.memberGrade.selected : this.memberGrade.defaultSelected) {

src/pages/parkingFeeV2/mixins/parkingFeeCoupon.js

@@ -84,7 +84,7 @@ export default {
       }
     },
     pageInit() {
-      const {parkInfo} = this.orderDetail
+      const {parkInfo, parkingRecord} = this.orderDetail
       const {parkMallCode} = parkInfo;
       /*
        * 电子优惠券初始化逻辑(后端处理)
@@ -93,7 +93,9 @@ export default {
        * 2、superposition  叠加使用规则 （1不可叠加，2仅同类型可叠加，3可叠加）;
        * */
       this.couponList = [...this.coupons];
-      this.remainPrice = this.usingTotalDiscount - this.paperDiscountFee;
+      // 如果存在第三方车场优惠
+      const {parkDiscount = 0} = parkingRecord
+      this.remainPrice = this.usingTotalDiscount - this.paperDiscountFee - parkDiscount;
       if ((this.parkMallCode === 4 || this.parkMallCode === 6) && this.orderDetail?.discountInfo?.points?.[0]?.discountFee) {
         this.remainPrice = this.remainPrice - this.orderDetail.discountInfo.points[0].discountFee
       }