From dad47eb0c8479d816c95279d8532def5fe1c331f Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 14 Aug 2024 15:41:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/TbProductSkuMapper.java  |  5 ++++-
 .../system/cashierservice/service/ProductService.java  | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
index 58b5428..1b33987 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
@@ -51,7 +51,7 @@ public interface TbProductSkuMapper {
     @Update("update tb_product_sku set stock_number=stock_number-#{num} WHERE id=#{id} ")
     int decrStockUnCheck(String id, int num);
 
-    @Select("select * from tb_product_sku where is_grounding=1 and product_id=#{id}")
+    @Select("select * from tb_product_sku where is_grounding=1 and product_id=#{id} and is_del=0")
     List<TbProductSku> selectByProductCheckGrounding(@Param("id") Integer id);
 
     @Select("select * from tb_product_sku where is_grounding=1 and is_del=0 and product_id=#{id}")
@@ -62,4 +62,7 @@ public interface TbProductSkuMapper {
 
     @Update("update tb_product_sku set stock_number=#{stock} where product_id=#{skuId} and shop_id=#{shopId}")
     int updateStock(@Param("shopId") Integer shopId, @Param("skuId") Integer skuId, @Param("stock") Integer stock);
+
+    @Select("select * from tb_product_sku where product_id=#{id} and is_del=0")
+    List<TbProductSku> selectByProductId(Integer id);
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 366791b..7c3d5df 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -192,7 +192,17 @@ public class ProductService {
 
                 // 查询sku信息
                 List<TbProductSku> skuWithBLOBs = tbProductSkuMapper.selectByProductCheckGrounding(it.getId());
+                List<TbProductSku> skus = tbProductSkuMapper.selectByProductId(it.getId());
+                if (it.getIsDistribute() == 0) {
+                    int num = 0;
+                    for (TbProductSku item : skus) {
+                        num += item.getStockNumber();
+                    }
+                    it.setStockNumber(num);
+                }
                 it.setSkuList(skuWithBLOBs);
+
+
             });
         }
         PageInfo pageInfo=new PageInfo(tbProductWithBLOBs);