Merge branch 'order_fee_update' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -5242,6 +5242,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (specialApplyVO.getFreight().compareTo(specialApplyVO.getOrgFreight()) == 0 && Objects.equals(specialApplyVO.getFreightCurrency(), specialApplyVO.getOrgFreightCurrency())) {
                     throw exception(SPECIAL_APPLY_DISCOUNT_FREIGHT_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
                 }
+                if (specialApplyVO.getCharging() == 0) {
                     if (Objects.isNull(specialApplyVO.getClearanceFreight()) || specialApplyVO.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
                         throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
                     }
@@ -5249,6 +5250,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
                     }
                 }
+            }
 
 
             if (specialApplyVO.getApplyType() == 3) {
@@ -5528,6 +5530,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (vo.getFreight().compareTo(vo.getOrgFreight()) == 0 && Objects.equals(vo.getFreightCurrency(), vo.getOrgFreightCurrency())) {
                         throw exception(SPECIAL_APPLY_DISCOUNT_FREIGHT_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
                     }
+                    if (vo.getCharging() == 0) {
                         if (Objects.isNull(vo.getClearanceFreight()) || vo.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
                             throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
                         }
@@ -5535,6 +5538,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                             throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
                         }
                     }
+                }
                 orderItemDOList.add(orderItemDO);
             }
         }