订单sku包装人工费计算调整

sd-business/src/main/java/com/sd/business/entity/bom/bo/BomSpecBo.java

@@ -64,4 +64,19 @@ public class BomSpecBo {
      */
     private String unit;
 
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
+
 }

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

@@ -324,7 +324,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             // 委外订单修改金额
             orderDto.setProductTotalAmount(BigDecimal.ZERO);
             orderDto.setDeliveryMaterialsFee(BigDecimal.ZERO);
-            orderDto.setManagementFee(BigDecimal.ZERO);
             orderDto.setPackingLabor(orderDto.getPackingLabor().multiply(new BigDecimal(2)));
             orderDto.setTotalAmount(orderDto.getProductTotalAmount()
                     .add(orderDto.getCustomProcessingFee())
@@ -354,7 +353,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                         item.setUnitPrice(BigDecimal.ZERO);
                         item.setLssueFee(BigDecimal.ZERO);
                         item.setDeliveryMaterialsFee(BigDecimal.ZERO);
-                        item.setManagementFee(BigDecimal.ZERO);
                         item.setPackingLabor(item.getPackingLabor().multiply(new BigDecimal(2)));
                     }
                 })
@@ -613,7 +611,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                         item.setUnitPrice(BigDecimal.ZERO);
                         item.setLssueFee(BigDecimal.ZERO);
                         item.setDeliveryMaterialsFee(BigDecimal.ZERO);
-                        item.setManagementFee(BigDecimal.ZERO);
                         item.setPackingLabor(item.getPackingLabor().multiply(new BigDecimal(2)));
                     }
                 })
@@ -784,7 +781,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             BigDecimal chargePrice = ObjectUtil.defaultIfNull(priceBillingStandardDetail.getChargePrice(), BigDecimal.ZERO);
             switch (chargeItem) {
                 case "40":
-                    skuSpecPriceVo.setPackingLabor(chargePrice);
+                    if (bomSpec.getWidth().compareTo(BigDecimal.valueOf(90)) >= 0) {
+                        skuSpecPriceVo.setPackingLabor(new BigDecimal("1.5"));
+                    } else {
+                        skuSpecPriceVo.setPackingLabor(chargePrice);
+                    }
                     break;
                 case "50":
                     skuSpecPriceVo.setLssueFee(chargePrice);

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuSpecServiceImpl.java

@@ -402,7 +402,11 @@ public class SkuSpecServiceImpl extends ServiceImpl<SkuSpecMapper, SkuSpec> impl
                         vo.setLogoProcessingFee(chargePrice);
                         break;
                     case "40":
-                        vo.setPackingLabor(chargePrice);
+                        if (bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) >= 0) {
+                            vo.setPackingLabor(new BigDecimal("1.5"));
+                        } else {
+                            vo.setPackingLabor(chargePrice);
+                        }
                         break;
                     case "50":
                         vo.setIssueFee(chargePrice);

sd-business/src/main/resources/mapper/sku/SkuSpecMapper.xml

@@ -29,6 +29,9 @@
         SELECT bs.id                                     bomSpecId,
                bs.code                                   bomSpecCode,
                bs.name                                   bomSpecName,
+               bs.length,
+               bs.width,
+               bs.height,
                b.species                                 bomSpecies,
                ifnull(bs.cost_price, '0.00')             costPrice,
                ifnull(bs.internal_selling_price, '0.00') internalSellingPrice,

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

@@ -630,7 +630,11 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
             switch (chargeItem) {
                 case "40":
-                    orderSku.setPackingLabor(chargePrice);
+                    if (bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) >= 0) {
+                        orderSku.setPackingLabor(new BigDecimal("1.5"));
+                    } else {
+                        orderSku.setPackingLabor(chargePrice);
+                    }
                     break;
                 case "50":
                     orderSku.setLssueFee(chargePrice);