no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -277,27 +277,27 @@ public class WebsitSalesLogic {
 
 
             // 商品类型为配件时单价要先乘倍率
-            if (sales.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())) {
-                final MaterialConfig config = materialConfigService.lambdaQuery()
-                        .eq(MaterialConfig::getCompanyWechatId, goods.getCompanyWechatId())
-                        .one();
-                BigDecimal afterPrice;
-                switch (goods.getPartType()) {
-                    case "空调":
-                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate1());
-                        break;
-                    case "冰箱":
-                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate2());
-                        break;
-                    case "生活电器":
-                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate3());
-                        break;
-                    default:
-                        throw new RemoteServiceException("未找到对应配件类型倍率");
-                }
-                item.setPrice(afterPrice);
-                item.setOrigPartsPrice(goods.getMarketPrice());
-            }
+//            if (sales.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())) {
+//                final MaterialConfig config = materialConfigService.lambdaQuery()
+//                        .eq(MaterialConfig::getCompanyWechatId, goods.getCompanyWechatId())
+//                        .one();
+//                BigDecimal afterPrice;
+//                switch (goods.getPartType()) {
+//                    case "空调":
+//                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate1());
+//                        break;
+//                    case "冰箱":
+//                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate2());
+//                        break;
+//                    case "生活电器":
+//                        afterPrice = goods.getMarketPrice().multiply(config.getPriceRate3());
+//                        break;
+//                    default:
+//                        throw new RemoteServiceException("未找到对应配件类型倍率");
+//                }
+//                item.setPrice(afterPrice);
+//                item.setOrigPartsPrice(goods.getMarketPrice());
+//            }
 
             // 商品类型为辅材并且库存单位与销售单位一致时转换系数为1
             if (sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
@@ -432,6 +432,11 @@ public class WebsitSalesLogic {
 
         sales.setSubmitTime(DateUtil.date());
         sales.setFlag(MaterialSalesFlagEnum.SUBMIT.getKey());
+        List<WebsitSalesItem> salesItems = websitSalesItemService.lambdaQuery()
+                .eq(WebsitSalesItem::getSalesId, sales.getSalesId())
+                .list();
+        this.goodsConditionHandle(sales, salesItems);
+
 
         if (sales.getPayType().equals(PayTypeEnum.CASH.getKey())
                 || sales.getPayType().equals(PayTypeEnum.ENGIN.getKey())) {