From 4172631bb51e54f47fe4920fe3325d4c73d5435c Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Mon, 22 Jan 2024 17:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AC=E6=8D=A2=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=EF=BC=8C=E4=BA=A7=E5=93=81=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6=20=E5=92=8C=E5=8F=AF=E4=B8=8B=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=20=E7=9A=84=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/modules/goods/entity/GoodsSku.java |  2 +-
 .../com/qs/serve/modules/goods/entity/GoodsSpu.java |  2 +-
 .../serve/modules/third/PortalGoodsController.java  | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

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<Long> spuIds = skuList.stream().filter(a->a.getSpecialFlag()!=1)
                 .map(a->a.getSpuId()).collect(Collectors.toList());
 
+        LambdaQueryWrapper<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
+        spuLqw.eq(GoodsSpu::getOrderFlag,1);
+        spuLqw.eq(GoodsSpu::getShelf,1);
+        spuLqw.in(GoodsSpu::getId,spuIds);
+        List<GoodsSpu> spuList = goodsSpuService.list(spuLqw);
+        spuIds = spuList.stream().map(a->a.getId).collect(Collectors.toList());
+
+        if(spuIds.size()==0){
+            spuIds.add(0L);
+        }
+
         LambdaQueryWrapper<GoodsSku> skuLqw = new LambdaQueryWrapper<>();
         skuLqw.eq(GoodsSku::getBelong,placeName);
         skuLqw.eq(GoodsSku::getOrderFlag,1);
+        skuLqw.eq(GoodsSku::getEnable,1);
         skuLqw.in(GoodsSku::getSpuId,spuIds);
         List<GoodsSku> normalSkus = goodsSkuService.list(skuLqw);
 
         LambdaQueryWrapper<GoodsSku> skuLqw2 = new LambdaQueryWrapper<>();
         skuLqw2.eq(GoodsSku::getBelong,"开平");
         skuLqw2.eq(GoodsSku::getOrderFlag,1);
+        skuLqw2.eq(GoodsSku::getEnable,1);
         skuLqw2.in(GoodsSku::getSpuId,spuIds);
         List<GoodsSku> kpSkus = goodsSkuService.list(skuLqw2);