From 912d2e62391b1459952375a60ba87cfa842f1c41 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 10:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   80 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index f66abae..b080dee 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -27,10 +27,7 @@
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -164,20 +161,56 @@
         goodsMapper.insert(goods);
 
         // 指定门店
-        List<GoodsShop> goodsShopList = goods.getGoodsShopList();
-        goodsShopService.saveBatch(goodsShopList);
+        Integer appointStore = goods.getAppointStore();
+        if (appointStore == 1){
+            List<GoodsShop> goodsShopList = goods.getGoodsShopList();
+            if (CollectionUtils.isEmpty(goodsShopList)){
+                throw new NullPointerException("请选择指定门店");
+            }
+            for (GoodsShop goodsShop : goodsShopList) {
+                goodsShop.setGoodsId(goods.getId());
+                goodsShop.setId(null);
+            }
+            goodsShopService.saveBatch(goodsShopList);
+        }
 
         // 指定用户
         List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
-        goodsAppUserService.saveBatch(goodsAppUserList);
+        if (!CollectionUtils.isEmpty(goodsAppUserList)){
+            for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+                goodsAppUser.setId(null );
+                goodsAppUser.setGoodsId(goods.getId());
+            }
+            goodsAppUserService.saveBatch(goodsAppUserList);
+        }
 
         // 会员价格配置
         List<GoodsVip> goodsVipList = goods.getGoodsVipList();
+        for (GoodsVip goodsVip : goodsVipList) {
+            goodsVip.setId(null);
+            goodsVip.setGoodsId(goods.getId());
+        }
         goodsVipService.saveBatch(goodsVipList);
 
         // 特殊地区售价设置
         List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
-        goodsAreaService.saveBatch(goodsAreaList);
+        if (!CollectionUtils.isEmpty(goodsAreaList)){
+            for (GoodsArea goodsArea : goodsAreaList) {
+                List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+                for (GoodsArea area : goodsAreaList1) {
+                    area.setGoodsId(goods.getId());
+                    area.setProvince(goodsArea.getProvince());
+                    area.setCity(goodsArea.getCity());
+                    area.setDistricts(goodsArea.getDistricts());
+                    area.setProvinceCode(goodsArea.getProvinceCode());
+                    area.setCityCode(goodsArea.getCityCode());
+                    area.setDistrictsCode(goodsArea.getDistrictsCode());
+                    goodsAreaList1.add(area);
+                }
+                goodsAreaService.saveBatch(goodsAreaList1);
+            }
+        }
+
     }
 
     @Override
@@ -197,7 +230,22 @@
 
         // 特殊地区售价设置
         List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
-        goodsAreaService.updateBatchById(goodsAreaList);
+        if (!CollectionUtils.isEmpty(goodsAreaList)){
+            for (GoodsArea goodsArea : goodsAreaList) {
+                List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
+                for (GoodsArea area : goodsAreaList1) {
+                    area.setGoodsId(goods.getId());
+                    area.setProvince(goodsArea.getProvince());
+                    area.setCity(goodsArea.getCity());
+                    area.setDistricts(goodsArea.getDistricts());
+                    area.setProvinceCode(goodsArea.getProvinceCode());
+                    area.setCityCode(goodsArea.getCityCode());
+                    area.setDistrictsCode(goodsArea.getDistrictsCode());
+                    goodsAreaList1.add(area);
+                }
+                goodsAreaService.updateBatchById(goodsAreaList1);
+            }
+        }
     }
 
     @Override
@@ -221,7 +269,19 @@
         // 特殊地区售价设置
         List<GoodsArea> goodsAreaList = goodsAreaService.list(new LambdaQueryWrapper<GoodsArea>()
                 .eq(GoodsArea::getGoodsId, goodsId));
-        goods.setGoodsAreaList(goodsAreaList);
+
+        Map<String, List<GoodsArea>> listMap = goodsAreaList.stream()
+                .collect(Collectors.groupingBy(goodsArea ->
+                        goodsArea.getProvinceCode() + goodsArea.getCityCode() + goodsArea.getDistrictsCode()));
+
+        List<GoodsArea> goodsAreaList1 = new ArrayList<>();
+        listMap.forEach((s, goodsAreas) -> {
+            GoodsArea goodsArea = goodsAreas.get(0);
+            goodsArea.setGoodsAreaList(goodsAreas);
+            goodsAreaList1.add(goodsArea);
+        });
+
+        goods.setGoodsAreaList(goodsAreaList1);
         return goods;
     }
 }

--
Gitblit v1.7.1