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,11 +5242,13 @@ 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 (Objects.isNull(specialApplyVO.getClearanceFreight()) || specialApplyVO.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
-                    throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
-                }
-                if (specialApplyVO.getClearanceFreight().compareTo(specialApplyVO.getOrgClearanceFreight()) == 0 && Objects.equals(specialApplyVO.getClearanceFreightCurrency(), specialApplyVO.getOrgClearanceFreightCurrency())) {
-                    throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_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);
+                    }
+                    if (specialApplyVO.getClearanceFreight().compareTo(specialApplyVO.getOrgClearanceFreight()) == 0 && Objects.equals(specialApplyVO.getClearanceFreightCurrency(), specialApplyVO.getOrgClearanceFreightCurrency())) {
+                        throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
+                    }
                 }
             }
 
@@ -5528,11 +5530,13 @@ 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 (Objects.isNull(vo.getClearanceFreight()) || vo.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
-                        throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
-                    }
-                    if (vo.getClearanceFreight().compareTo(vo.getOrgClearanceFreight()) == 0 && Objects.equals(vo.getClearanceFreightCurrency(), vo.getOrgClearanceFreightCurrency())) {
-                        throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_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);
+                        }
+                        if (vo.getClearanceFreight().compareTo(vo.getOrgClearanceFreight()) == 0 && Objects.equals(vo.getClearanceFreightCurrency(), vo.getOrgClearanceFreightCurrency())) {
+                            throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
+                        }
                     }
                 }
                 orderItemDOList.add(orderItemDO);