枚举适配

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -240,19 +240,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             String chargeItem = priceBillingStandardDetail.getChargeItem();
             BigDecimal chargePrice = ObjectUtil.defaultIfNull(priceBillingStandardDetail.getChargePrice(), BigDecimal.ZERO);
             switch (chargeItem) {
-                case "3":
+                case "40":
                     skuSpecPriceVo.setPackingLabor(chargePrice);
                     break;
-                case "4":
+                case "50":
                     skuSpecPriceVo.setLssueFee(chargePrice);
                     break;
-                case "5":
+                case "60":
                     skuSpecPriceVo.setDeliveryMaterialsFee(chargePrice);
                     break;
                 default:
                     if (Objects.equals(chargeItem, skuSpec.getMachinedPanel())
-                            && priceBillingStandardDetail.getSectionMin().compareTo(dto.getQuantity()) >= 0
-                            && priceBillingStandardDetail.getSectionMax().compareTo(dto.getQuantity()) < 0) {
+                            && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
+                            && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
                         skuSpecPriceVo.setCustomProcessingFee(chargePrice);
                     }
             }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -490,21 +490,21 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             BigDecimal chargePrice = ObjectUtil.defaultIfNull(priceBillingStandardDetail.getChargePrice(), BigDecimal.ZERO);
 
             switch (chargeItem) {
-                case "3":
+                case "40":
                     orderSku.setPackingLabor(chargePrice);
                     break;
-                case "4":
+                case "50":
                     orderSku.setLssueFee(chargePrice);
                     break;
-                case "5":
+                case "60":
                     orderSku.setDeliveryMaterialsFee(chargePrice);
                     break;
                 default:
                     SkuSpec skuSpec = skuSpecMap.get(orderSku.getWlnSkuSpecId());
                     if (skuSpec != null
                             && Objects.equals(chargeItem, skuSpec.getMachinedPanel())
-                            && priceBillingStandardDetail.getSectionMin().compareTo(orderSku.getQuantity()) >= 0
-                            && priceBillingStandardDetail.getSectionMax().compareTo(orderSku.getQuantity()) < 0) {
+                            && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
+                            && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
                         orderSku.setCustomProcessingFee(chargePrice);
                     }
             }