From 1d927f7fd2faa981d00ca7274a760b2b75646fb6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 12 Mar 2024 10:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=8C=85?=
 =?UTF-8?q?=E6=8B=AC=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=97=B6=20=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=BA=93=E5=AD=98=E4=B8=8D=E5=8F=AF=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/pojo/product/TbProduct.java   | 2 +-
 .../service/impl/productimpl/TbProductServiceImpl.java     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
index a0dff5fd..fb4c4fe8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
@@ -157,7 +157,7 @@ public class TbProduct implements Serializable {
     private Integer isOnSale = 0;
 
     @Column(name = "`is_show`")
-    @ApiModelProperty(value = "是否展示0-不展示 1.小程序2.收银端 9.全展示")
+    @ApiModelProperty(value = "是否展示0-下架 1上架---废弃")
     private Integer isShow = 0;
 
     @Column(name = "`type_enum`")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index b7b77214..ce2bdef3 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -231,6 +231,13 @@ public class TbProductServiceImpl implements TbProductService {
         if (resources.getCategoryId() == null){
             throw new BadRequestException("必填内容未填写");
         }
+        if (resources.getIsShowMall()==1){
+            for (TbProductSku sku : resources.getSkuList()) {
+                if(sku.getStockNumber()<=0){
+                    throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。");
+                }
+            }
+        }
         product.setImages(resources.getImages().toString());
         product.setCategoryId(String.valueOf(resources.getCategoryId()));
         product.setIsDel(0);