diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 6f59db8d..2c5ad14d 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -74,7 +74,7 @@ public class GoodsSku implements Serializable { /** 最低起批数(0->不限制) */ private Integer minPurchase; - /** 投放费用 1、是;0否 */ + /** 是否开启 1、是;0否 */ private Integer enable; /** 是否可以下单 1、是;0否 */ diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index 5bd2974a..6b34cdeb 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -61,7 +61,7 @@ public class GoodsSpu implements Serializable { @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) private String[] picUrls; - /** 投放费用(1是 0否) */ + /** 上下架(1是 0否) */ private Integer shelf; /** 是否可以下单 1、是;0否 */ diff --git a/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java b/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java index b3ec3ce4..da29d0df 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java @@ -68,15 +68,28 @@ public class PortalGoodsController { List spuIds = skuList.stream().filter(a->a.getSpecialFlag()!=1) .map(a->a.getSpuId()).collect(Collectors.toList()); + LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); + spuLqw.eq(GoodsSpu::getOrderFlag,1); + spuLqw.eq(GoodsSpu::getShelf,1); + spuLqw.in(GoodsSpu::getId,spuIds); + List spuList = goodsSpuService.list(spuLqw); + spuIds = spuList.stream().map(a->a.getId).collect(Collectors.toList()); + + if(spuIds.size()==0){ + spuIds.add(0L); + } + LambdaQueryWrapper skuLqw = new LambdaQueryWrapper<>(); skuLqw.eq(GoodsSku::getBelong,placeName); skuLqw.eq(GoodsSku::getOrderFlag,1); + skuLqw.eq(GoodsSku::getEnable,1); skuLqw.in(GoodsSku::getSpuId,spuIds); List normalSkus = goodsSkuService.list(skuLqw); LambdaQueryWrapper skuLqw2 = new LambdaQueryWrapper<>(); skuLqw2.eq(GoodsSku::getBelong,"开平"); skuLqw2.eq(GoodsSku::getOrderFlag,1); + skuLqw2.eq(GoodsSku::getEnable,1); skuLqw2.in(GoodsSku::getSpuId,spuIds); List kpSkus = goodsSkuService.list(skuLqw2);