Merge pull request #453 from John-Hong/release-3.3.0

fix(SCRM-5792): 积分减免的 当前无需追加优惠 逻辑调整

src/store/order/points.js

@@ -194,7 +194,8 @@ export default {
     //   return
     // }
     if ( type === 'add' ) {
-      if(!state.actualPayFee) {
+      // this.totalFeeInYuan - this.remainPrice <= 0
+      if(state.orderDetail.parkingRecord.totalFeeInYuan - state.usingTotalDiscount <= 0) {
         Toast('当前无需追加优惠')
         return;
       }
@@ -248,7 +249,6 @@ export default {
   async savePointsMath( {commit,dispatch,state},callback ) {
     try {
       let orderDetail = {...state.orderDetail};
-
       const {parkInfo,parkingRule} = state.orderDetail
       const {maxOneTimeDiscountTime,oneTimeLimitation,oneDayLimitation,hourPrice,remainConsumeTime} = parkingRule
       const {parkMallCode} = parkInfo
@@ -290,6 +290,7 @@ export default {
   }) {
     const orderDetail = lodash.cloneDeep(state.orderDetail)
     orderDetail.discountInfo.newMemberPoints = newMemberPoints;
+
     setSelected(['memberGrade','consume','paperCoupons','coupons','points'],orderDetail)
     // 新会员积分
     const res = await calculateDiscount({