Merge pull request #554 from John-Hong/John/release-3-9.0/SCRM-6512

fix(SCRM-6512): 用户提交数据时, 如果 消费减免 不能使用, discountFee 设置为0

src/store/order/utils.js

@@ -20,7 +20,11 @@ export function setSelected( types,orderDetail ) {
         // 如果是消费减免
         if ( orderDetail.discountInfo?.consume?.length ) {
           const [consume] = orderDetail.discountInfo?.consume;
-          consume.discountFee = consume.hasOwnProperty('discountFee') ? consume.discountFee : consume.defaultDiscountTime * orderDetail.parkingRule.hourPrice || 0
+          if (consume.hasOwnProperty('defaultDiscountTime') && consume.hasOwnProperty('maxDiscountTime')) {
+            consume.discountFee = consume.hasOwnProperty('discountFee') ? consume.discountFee : Math.min(consume.defaultDiscountTime, consume.maxDiscountTime) * orderDetail.parkingRule.hourPrice || 0
+          } else {
+            consume.discountFee = consume.hasOwnProperty('discountFee') ? consume.discountFee : consume.defaultDiscountTime * orderDetail.parkingRule.hourPrice || 0
+          }
           orderDetail.discountInfo.consume = [{
             ...consume,
             selected: consume.hasOwnProperty('selected') ? consume.selected : consume?.defaultSelected || false