From ccba29361bd1b8bec5bf985301a28d99bacccf7f Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 1 Aug 2024 14:22:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BC=96=E8=BE=91=E5=95=86=E5=93=81=E4=B8=8D?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E4=B8=8A=E4=B8=8B=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/pojo/product/TbProductSku.java    |  2 +-
 .../productimpl/TbProductServiceImpl.java     | 23 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
index a108fafc..4c66cfcf 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
@@ -129,7 +129,7 @@ public class TbProductSku implements Serializable {
 
     @Column(name = "`is_grounding`")
     @ApiModelProperty(value = "是否上架")
-    private Integer isGrounding = 1;
+    private Integer isGrounding;
 
     public void setIsDel(Integer isDel) {
         if(isDel!=null){
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index 9e181f3d..7d6993f6 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -374,6 +374,8 @@ public class TbProductServiceImpl implements TbProductService {
             }
         }
 
+        // 默认开启共享库存和库存
+//        product.setIsDistribute(1);
         TbProduct save = tbProductRepository.save(product);
         if (save.getId() == null) {
             throw new BadRequestException("添加商品失败");
@@ -489,13 +491,28 @@ public class TbProductServiceImpl implements TbProductService {
 //                }
 //            }
             if ("sku".equals(save.getTypeEnum())) {
-                List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList());
+//                List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList());
                 List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString());
+                List<Integer> collect = tbProductSkus.stream().map(TbProductSku::getId).collect(Collectors.toList());
+                HashMap<String, TbProductSku> skuInfo = new HashMap<>();
                 for (TbProductSku productSkus : tbProductSkus) {
-                    if (!collect.contains(productSkus.getId())) {
-                        tbProductSkuRepository.deleteBySkuId(productSkus.getId());
+                    skuInfo.put(productSkus.getId().toString(), productSkus);
+                }
+                for (TbProductSku tbProductSku : resources.getSkuList()) {
+                    if (!collect.contains(tbProductSku.getId())) {
+                        tbProductSkuRepository.deleteBySkuId(tbProductSku.getId());
+                    }else {
+                        TbProductSku productSku = skuInfo.get(tbProductSku.getId().toString());
+                        if (productSku != null) {
+                            tbProductSku.setIsGrounding(productSku.getIsGrounding());
+                        }
                     }
                 }
+//                for (TbProductSku productSkus : tbProductSkus) {
+//                    if (!collect.contains(productSkus.getId())) {
+//                        tbProductSkuRepository.deleteBySkuId(productSkus.getId());
+//                    }
+//                }
             }
             tbProductSkuRepository.saveAll(resources.getSkuList());
         }