Merge pull request #339 from John-Hong/John/release-2.20.0/SCRM-5068-2

fix(SCRM-5105): 在积分加减时，使用 availableDiscountFee 来作为用户的积分使用上限的参数

src/store/order/points.js

@@ -112,7 +112,7 @@ export default {
   // 积分减免
   pointsMath( {commit,dispatch,state},{type,callback} ) {
     const {parkInfo,parkingRule,parkingRecord, discountInfo = {}} = state.orderDetail
-    const {maxOneTimeDiscountTime,oneTimeLimitation,oneDayLimitation,hourPrice,remainConsumeTime, maxOneDayDiscountFee} = parkingRule
+    const {maxOneTimeDiscountTime,oneTimeLimitation,oneDayLimitation,hourPrice,remainConsumeTime, maxOneDayDiscountFee, availableDiscountFee = -1 } = parkingRule
     const {parkMallCode} = parkInfo
     const [points] = discountInfo?.points || [{}]
     console.log(376,maxOneTimeDiscountTime,state.availableDiscountFee)
@@ -172,7 +172,8 @@ export default {
     // 北京积分使用限制
     if(!msg && type === 'add' && parkMallCode === 3) {
       const{ maxDiscountFee = 0, unitAmount =0 } = points
-      if ( maxDiscountFee && state.pointsTime >= maxDiscountFee/unitAmount) {
+      const userMaxDiscountFee = availableDiscountFee > maxDiscountFee ? maxDiscountFee : availableDiscountFee
+      if ( maxDiscountFee && state.pointsTime >= userMaxDiscountFee/unitAmount) {
         msg = `超出抵扣上限,每次最高可抵扣${ maxDiscountFee/unitAmount  }小时`
       }
     }