From af92bc21c95e7d91f7b774820e2feb9f2f5cd973 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 24 Nov 2023 16:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=90=8C=E6=AD=A5=E5=88=B0?=
 =?UTF-8?q?=E9=94=80=E8=B7=AF=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TzcPolicyApplicationServiceImpl.java        | 12 ++++++++----
 src/main/resources/mapper/goods/GoodsSkuMapper.xml   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
index 462ca032..d9099503 100644
--- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
@@ -133,20 +133,24 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
                 continue;
             }
             if(goodType.equals(TbsGoodsType.sku.name())){
-                List<GoodsSku> goodsSkus = goodsSkuService.listByIds(targetIds);
-                List<String> skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).collect(Collectors.toList());
+                LambdaQueryWrapper<GoodsSku> lqw = new LambdaQueryWrapper<>();
+                lqw.in(GoodsSku::getId,targetIds);
+                lqw.eq(GoodsSku::getEnable,1);
+                List<GoodsSku> goodsSkus = goodsSkuService.list(lqw);
+                List<String> skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).filter(Objects::nonNull).collect(Collectors.toList());
                 invCodes.addAll(skuCodes);
             }else if(goodType.equals(TbsGoodsType.spu.name())){
                 LambdaQueryWrapper<GoodsSku> lqw = new LambdaQueryWrapper<>();
                 lqw.in(GoodsSku::getSpuId,targetIds);
                 lqw.select(GoodsSku::getId);
+                lqw.eq(GoodsSku::getEnable,1);
                 List<GoodsSku> goodsSkus = goodsSkuService.list(lqw);
-                List<String> skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).collect(Collectors.toList());
+                List<String> skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).filter(Objects::nonNull).collect(Collectors.toList());
                 invCodes.addAll(skuCodes);
             }else {
                 List<GoodsSku> goodsSkus = goodsSkuService.selectSkuByCategoryIds(targetIds);
                 List<String> invCodeList = goodsSkus.stream()
-                        .map(GoodsSku::getSkuCode).distinct().collect(Collectors.toList());
+                        .map(GoodsSku::getSkuCode).filter(Objects::nonNull).distinct().collect(Collectors.toList());
                 invCodes.addAll(invCodeList);
             }
         }
diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml
index c2c754ff..9256e7d0 100644
--- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml
+++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml
@@ -148,6 +148,8 @@
         WHERE
             goods_sku.tenant_id = #{tenantId}
             and goods_sku.del_flag = 0
+            and goods_sku.enable = 1
+            and goods_spu.shlef = 1
             and goods_spu.category_third in
             <foreach collection="categoryIds" item ="selectId" index="i" open="(" close=")" separator=",">
                 #{selectId}