提交

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

@@ -788,13 +788,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                         skuSpecPriceVo.setPackingLabor(new BigDecimal("0.1"));
                         break;
                     }
-                    if (bomSpec.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
+                    if (Objects.nonNull(bomSpec.getWidth()) && bomSpec.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
                         skuSpecPriceVo.setPackingLabor(new BigDecimal("1.5"));
                     } else {
                         skuSpecPriceVo.setPackingLabor(chargePrice);
                     }
                     break;
                 case "50":
+                    if (bomSpec.getName().contains("支撑垫")) {
+                        skuSpecPriceVo.setLssueFee(new BigDecimal("0.25"));
+                        break;
+                    }
                     skuSpecPriceVo.setLssueFee(chargePrice);
                     break;
                 case "60":

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

@@ -444,13 +444,17 @@ public class SkuSpecServiceImpl extends ServiceImpl<SkuSpecMapper, SkuSpec> impl
                             vo.setPackingLabor(new BigDecimal("0.1"));
                             break;
                         }
-                        if (bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
+                        if (Objects.nonNull(bomSpecBo.getWidth()) && bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
                             vo.setPackingLabor(new BigDecimal("1.5"));
                         } else {
                             vo.setPackingLabor(chargePrice);
                         }
                         break;
                     case "50":
+                        if (bomSpecBo.getBomSpecName().contains("支撑垫")) {
+                            vo.setIssueFee(new BigDecimal("0.25"));
+                            break;
+                        }
                         vo.setIssueFee(chargePrice);
                         break;
                     case "70":

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

@@ -718,13 +718,17 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                         orderSku.setPackingLabor(new BigDecimal("0.1"));
                         break;
                     }
-                    if (bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
+                    if (Objects.nonNull(bomSpecBo.getWidth()) && bomSpecBo.getWidth().compareTo(BigDecimal.valueOf(90)) > 0) {
                         orderSku.setPackingLabor(new BigDecimal("1.5"));
                     } else {
                         orderSku.setPackingLabor(chargePrice);
                     }
                     break;
                 case "50":
+                    if (bomSpecBo.getBomSpecName().contains("支撑垫")) {
+                        orderSku.setLssueFee(new BigDecimal("0.25"));
+                        break;
+                    }
                     orderSku.setLssueFee(chargePrice);
                     break;
                 case "70":