‘linchangsheng’ před 1 měsícem
rodič
revize
4da390c9e6

+ 28 - 27
src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -440,17 +440,28 @@ public class GoodsLogic {
         }
         goodsBean.setUpdateTime(new Date());
         goodsBean.setCreateTime(creatDate);
+        String name ="";
+        for (GoodsCompany goodsCompany : goodsBean.getGoodsCompanies()) {
 
-        List<GoodsCompany> goodsCompanies = new ArrayList<>();
+            AdminCompany adminCompany = adminCompanyService.getById(goodsCompany.getCompanyId());
+            name = name+adminCompany.getAdminCompanyName()+",";
+            goodsCompany.setGoodsId(goodsBean.getGoodsId());
+            goodsCompany.setConpanyName(adminCompany.getAdminCompanyName());
+        }
+
+        goodsCompanyService.saveBatch(goodsBean.getGoodsCompanies());
+
+        String result = name.substring(0, name.length() - 1);
+        goodsBean.setPutCompanyName(result);
 
-        if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
+/*        if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
             goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
             String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
 
-            String name ="";
+
             for (String s : split) {
                 AdminCompany adminCompany = adminCompanyService.getById(s);
-                name = name+adminCompany.getAdminCompanyName()+",";
+
 
                 GoodsCompany goodsCompany = new GoodsCompany();
                 goodsCompany.setGoodsId(goodsBean.getGoodsId());
@@ -459,11 +470,10 @@ public class GoodsLogic {
 
                 goodsCompanies.add(goodsCompany);
             }
-            String result = name.substring(0, name.length() - 1);
-            goodsBean.setPutCompanyName(result);
 
-            goodsCompanyService.saveBatch(goodsCompanies);
-        }
+
+
+        }*/
 
         GoodsCategory goodsCategory = goodsCategoryService.getById(goodsBean.getCategoryId());
         GoodsCategory goodsCategoryPid = goodsCategoryService.getById(goodsCategory.getParentId());
@@ -601,30 +611,21 @@ public class GoodsLogic {
 
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<GoodsCompany> goodsCompanies = new ArrayList<>();
 
         goodsCompanyService.lambdaUpdate().eq(GoodsCompany::getGoodsId,goodsBean.getGoodsId()).remove();
-        if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
-            goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
-            String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
+        String name ="";
+        for (GoodsCompany goodsCompany : goodsBean.getGoodsCompanies()) {
 
-            String name ="";
-            for (String s : split) {
-                AdminCompany adminCompany = adminCompanyService.getById(s);
-                name = name+adminCompany.getAdminCompanyName()+",";
-
-                GoodsCompany goodsCompany = new GoodsCompany();
-                goodsCompany.setGoodsId(goodsBean.getGoodsId());
-                goodsCompany.setConpanyName(adminCompany.getAdminCompanyName());
-                goodsCompany.setCompanyId(adminCompany.getAdminCompanyId());
+            AdminCompany adminCompany = adminCompanyService.getById(goodsCompany.getCompanyId());
+            name = name+adminCompany.getAdminCompanyName()+",";
+            goodsCompany.setGoodsId(goodsBean.getGoodsId());
+            goodsCompany.setConpanyName(adminCompany.getAdminCompanyName());
+        }
 
-                goodsCompanies.add(goodsCompany);
-            }
-            String result = name.substring(0, name.length() - 1);
-            goodsBean.setPutCompanyName(result);
+        goodsCompanyService.saveBatch(goodsBean.getGoodsCompanies());
 
-            goodsCompanyService.saveBatch(goodsCompanies);
-        }
+        String result = name.substring(0, name.length() - 1);
+        goodsBean.setPutCompanyName(result);
 
         List<GoodsSpec> notRemoveList = new ArrayList<>();
         //查找未删除的规格