From a6667cd850cec27fce7531215e3fa6ae75b3ce95 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 31 Dec 2024 16:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SupermarketSpuServiceImpl.java       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java
index e61057670..1425e56c9 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java
@@ -13,9 +13,11 @@ import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 商品spu
@@ -31,6 +33,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
 
     private final SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService;
     @Override
+    @Transactional
     public R saveSpu(SupermarketSpuEntity supermarketSpu) {
 
         baseMapper.insert(supermarketSpu);
@@ -38,6 +41,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
         //新增包装类型
         List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
         if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
+            supermarketUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
             supermarketUnitService.saveBatch(supermarketUnitEntityList);
         }else {
             return R.failed("包装类型不能为空");
@@ -45,6 +49,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
         //辅助条码
         List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
         if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
+            supermarketAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
                 supermarketAuxiliaryCodeService.saveBatch(supermarketAuxiliaryCodeEntityList);
         }else {
             return R.failed("辅助条码不能为空");
@@ -54,20 +59,30 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
     }
 
     @Override
+    @Transactional
     public R updateSpuById(SupermarketSpuEntity supermarketSpu) {
         baseMapper.updateById(supermarketSpu);
 
         //新增包装类型
         List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
         if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
-            supermarketUnitService.updateBatchById(supermarketUnitEntityList);
+            //id为null新增
+            List<SupermarketUnitEntity> insertCollect = supermarketUnitEntityList.stream()
+                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList());
+            List<SupermarketUnitEntity> updateCollect = supermarketUnitEntityList.stream()
+                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList());
+            supermarketUnitService.updateBatchById(updateCollect);
+            supermarketUnitService.saveBatch(insertCollect);
         }else {
             return R.failed("包装类型不能为空");
         }
         //辅助条码
         List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
         if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
-            supermarketAuxiliaryCodeService.updateBatchById(supermarketAuxiliaryCodeEntityList);
+            List<SupermarketAuxiliaryCodeEntity> insertCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList());
+            List<SupermarketAuxiliaryCodeEntity> updateCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList());
+            supermarketAuxiliaryCodeService.saveBatch(insertCollect);
+            supermarketAuxiliaryCodeService.updateBatchById(updateCollect);
         }else {
             return R.failed("辅助条码不能为空");
         }