From 551104543dd44c6d78bf187f80449290d6be0df9 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 23 Sep 2024 13:59:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/productimpl/TbProductServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

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 a6a75ba1..111c8cf7 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
@@ -249,6 +249,7 @@ public class TbProductServiceImpl implements TbProductService {
             TbProductNewVo productNewVo = new TbProductNewVo();
             BeanUtils.copyProperties(product, productNewVo);
             productNewVo.setLowPrice("￥" + product.getLowPrice().toString());
+            productNewVo.setStockNumber(Double.valueOf(product.getStockNumber()));
             List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(product.getId().toString());
             if (tbProductSkus.size() > 1) {
                 BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();

From 8208f97c67cc374a58a73f9708cb7158660acdb4 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 23 Sep 2024 14:00:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BB=B7=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/repository/product/TbProductSkuRepository.java  | 4 ++++
 .../cashier/service/impl/productimpl/StockServiceImpl.java  | 6 ++++++
 .../src/main/java/cn/ysk/cashier/vo/StockUpdateValueVO.java | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

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 796065a9..216d729c 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
@@ -205,4 +205,8 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
     @Modifying
     @Query("update TbProductSku set isGrounding=:isGrounding where id=:skuId")
     void updateGrounding(Integer skuId,int isGrounding);
+
+    @Modifying
+    @Query("update TbProductSku set salePrice = :salePrice where productId=:productId")
+    void upSalePrice(@Param("productId") Integer productId, @Param("lowPrice") BigDecimal salePrice);
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
index 6432a154..d56fc6cf 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
@@ -379,6 +379,12 @@ public class StockServiceImpl implements StockService {
                 description.append(" 库存数量修改为:"+updateValueVO.getValue()+" 原库存:"+product.getStockNumber());
                 sqlQuery.append(" set stock_number = ").append(updateValueVO.getValue());
                 break;
+            case "salePrice"://价格
+                description.append("修改价格为" + updateValueVO.getValue());
+                sqlQuery.append(" set low_price = ").append(updateValueVO.getValue());
+                tbProductRepository.upLowPrice(product.getId(),new BigDecimal(updateValueVO.getValue()));
+                tbProductSkuRepository.upSalePrice(product.getId(),new BigDecimal(updateValueVO.getValue()));
+                break;
 //            case "stock"://库存开关
 //                if (!"0".equals(updateValueVO.getValue()) && !"1".equals(updateValueVO.getValue())) {
 //                    throw new BadRequestException("无效值");
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockUpdateValueVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockUpdateValueVO.java
index d9e3ed2c..b1e220a8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockUpdateValueVO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/StockUpdateValueVO.java
@@ -13,7 +13,7 @@ public class StockUpdateValueVO {
     private String shopId;
     @NotNull
     private boolean isSku;
-    @NotNull(message = "主键不可为空")
+//    @NotNull(message = "主键不可为空")
     private String id;
     @NotNull(message = "key不可为空")
     private String key;