From a54f1626906909286bec2702f79a239691d1e4dc Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Tue, 25 Jun 2024 18:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=AB=AF=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=95=86=E5=93=81=E5=B9=B3=E5=8F=B0=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E7=8A=B6=E6=80=81=E5=8A=9F=E8=83=BD=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shop/cereshop/admin/page/product/ShopProduct.java | 6 ++++++
 .../main/resources/mybatis/mapper/product/CereShopProductDAO.xml    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
index 68362e0..8d37774 100644
--- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
+++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/page/product/ShopProduct.java
@@ -112,4 +112,10 @@ public class ShopProduct {
     @TableField(exist = false)
     private String classifyName;
 
+    /**
+     * 商品上架平台状态 0-已下架 1-已上架 2-待审核 3-审核失败
+     */
+    @ApiModelProperty(value = "商品上架平台状态 0-已下架 1-已上架 2-待审核 3-审核失败")
+    private Integer platShelveState;
+
 }
diff --git a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
index 3a8a31b..98e8e2a 100644
--- a/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
+++ b/cereshop-admin/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
@@ -412,7 +412,7 @@
   <select id="getAll" parameterType="com.shop.cereshop.admin.param.product.ProductGetAllParam" resultType="com.shop.cereshop.admin.page.product.ShopProduct">
     SELECT a.product_id,a.product_name,c.price,concat('￥',c.price,'~￥',d.price) sectionPrice,
     IF(f.image IS NULL OR f.image='',b.product_image,f.image) image,e.shop_name,
-    c.stock_number,a.shelve_state,a.fictitious_number,a.create_time,g.volume,a.classify_id,b.product_image from cere_shop_product a
+    c.stock_number,a.shelve_state,a.plat_shelve_state,a.fictitious_number,a.create_time,g.volume,a.classify_id,b.product_image from cere_shop_product a
     LEFT JOIN (SELECT a.product_id,a.product_image from cere_product_image a,
     cere_shop_product b where a.product_id=b.product_id GROUP BY a.product_id) b ON a.product_id=b.product_id
     LEFT JOIN (SELECT a.product_id,a.sku_id,MIN(a.price) price,
@@ -441,7 +441,7 @@
       and a.create_time&gt;=#{startTime} and a.create_time&lt;=#{endTime}
     </if>
     <if test="shelveState!=null">
-      and a.shelve_state=#{shelveState}
+      and a.plat_shelve_state=#{shelveState}
     </if>
     <if test="productIdList!=null and productIdList.size()>0">
       and a.product_id in (