From 2a6dcf563b885d3bc84127291126022662619b34 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 20 Jul 2024 17:00:39 +0800
Subject: [PATCH] =?UTF-8?q?1.sku=E5=94=AE=E5=87=BA=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98=202.=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9D=A1=E7=9B=AE=E6=95=B0=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/TbProductSkuRepository.java       |   2 +-
 .../java/cn/ysk/cashier/vo/StockV2Vo.java     | 151 +++++++++++++++++-
 2 files changed, 151 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
index 83a0fb42..d38551d9 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
@@ -63,7 +63,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
     @Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
             "sku.id,pro.id,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
             "CASE WHEN pro.isDistribute = 1 THEN IFNULL(pro.stockNumber, 0) ELSE SUM(sku.stockNumber) END as number" +
-            ", pro.isDistribute, pro.isPauseSale, true, sku.warnLine, pro.lowPrice)  " +
+            ", pro.isDistribute, pro.isPauseSale, true, sku.warnLine, pro.lowPrice, CASE WHEN sku.isGrounding=1 THEN true ELSE false END as isGrounding)  " +
             "from " +
             "TbProduct pro " +
             "LEFT JOIN TbProductSku sku on pro.id = sku.productId " +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockV2Vo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockV2Vo.java
index 4806f913..3878682b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockV2Vo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockV2Vo.java
@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * @author GYJ
  */
-@Data
 public class StockV2Vo {
     private String id;
     private Integer skuId;
@@ -25,6 +24,7 @@ public class StockV2Vo {
     private Object number;
     private Integer warnLine;
     private BigDecimal salePrice;
+    private boolean isGrounding;
 
     public StockV2Vo(Integer proId, Integer skuId, String name, String unitName,String specSnap, Object number,Object stockNumber, Integer isDistribute) {
         this.proId = proId;
@@ -80,6 +80,7 @@ public class StockV2Vo {
         this.warnLine = warnLine;
     }
 
+
     public StockV2Vo(Integer id, Integer proId,String img,String name,String unitName, String type, String specSnap,
                      Object isStock, Object number, Integer isDistribute, Integer isPauseSale, boolean isPro, Integer warnLine, BigDecimal sellPrice) {
         this.id = id.toString() + "-" + proId.toString();
@@ -103,6 +104,154 @@ public class StockV2Vo {
         this.salePrice = sellPrice;
     }
 
+    public StockV2Vo(Integer id, Integer proId,String img,String name,String unitName, String type, String specSnap,
+                     Object isStock, Object number, Integer isDistribute, Integer isPauseSale, boolean isPro, Integer warnLine, BigDecimal sellPrice, boolean isGrounding) {
+        this.id = id.toString() + "-" + proId.toString();
+        if (isPro) {
+            this.id += proId;
+        } else {
+            this.id += id;
+        }
+        this.skuId = id;
+        this.proId = proId;
+        this.img = img;
+        this.name = name;
+        this.unitName = unitName;
+        setType(type);
+        this.specSnap = specSnap;
+        this.isStock = isStock;
+        this.stockNumber = number;
+        this.isDistribute = isDistribute;
+        this.isPauseSale = isPauseSale;
+        this.warnLine = warnLine;
+        this.salePrice = sellPrice;
+        this.isGrounding = isGrounding;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getSkuId() {
+        return skuId;
+    }
+
+    public void setSkuId(Integer skuId) {
+        this.skuId = skuId;
+    }
+
+    public Integer getProId() {
+        return proId;
+    }
+
+    public void setProId(Integer proId) {
+        this.proId = proId;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getSpecSnap() {
+        return specSnap;
+    }
+
+    public void setSpecSnap(String specSnap) {
+        this.specSnap = specSnap;
+    }
+
+    public Object getIsStock() {
+        return isStock;
+    }
+
+    public void setIsStock(Object isStock) {
+        this.isStock = isStock;
+    }
+
+    public Object getStockNumber() {
+        return stockNumber;
+    }
+
+    public void setStockNumber(Object stockNumber) {
+        this.stockNumber = stockNumber;
+    }
+
+    public Integer getIsDistribute() {
+        return isDistribute;
+    }
+
+    public void setIsDistribute(Integer isDistribute) {
+        this.isDistribute = isDistribute;
+    }
+
+    public Integer getIsPauseSale() {
+        return isPauseSale;
+    }
+
+    public void setIsPauseSale(Integer isPauseSale) {
+        this.isPauseSale = isPauseSale;
+    }
+
+    public Object getNumber() {
+        return number;
+    }
+
+    public void setNumber(Object number) {
+        this.number = number;
+    }
+
+    public Integer getWarnLine() {
+        return warnLine;
+    }
+
+    public void setWarnLine(Integer warnLine) {
+        this.warnLine = warnLine;
+    }
+
+    public BigDecimal getSalePrice() {
+        return salePrice;
+    }
+
+    public void setSalePrice(BigDecimal salePrice) {
+        this.salePrice = salePrice;
+    }
+
+    public boolean getIsGrounding() {
+        return isGrounding;
+    }
+
+    public void setIsGrounding(boolean grounding) {
+        isGrounding = grounding;
+    }
+
     public void setType(String type) {
         switch (type) {
             case "normal":