政策同步到销路通

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);
             }
         }

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}