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 goodsSkus = goodsSkuService.listByIds(targetIds); - List skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).collect(Collectors.toList()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(GoodsSku::getId,targetIds); + lqw.eq(GoodsSku::getEnable,1); + List goodsSkus = goodsSkuService.list(lqw); + List skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).filter(Objects::nonNull).collect(Collectors.toList()); invCodes.addAll(skuCodes); }else if(goodType.equals(TbsGoodsType.spu.name())){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.in(GoodsSku::getSpuId,targetIds); lqw.select(GoodsSku::getId); + lqw.eq(GoodsSku::getEnable,1); List goodsSkus = goodsSkuService.list(lqw); - List skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).collect(Collectors.toList()); + List skuCodes = goodsSkus.stream().map(GoodsSku::getSkuCode).filter(Objects::nonNull).collect(Collectors.toList()); invCodes.addAll(skuCodes); }else { List goodsSkus = goodsSkuService.selectSkuByCategoryIds(targetIds); List 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 #{selectId}