From e0359be0dc0c5d8b390216fc76bcf5f148b7866d Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 5 Jul 2024 11:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=89=A3=E5=8F=96=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/dao/TbProductMapper.java   |  2 +-
 .../dao/TbProductSkuMapper.java               |  2 +-
 .../cashierservice/service/OrderService.java  | 20 +++++++++----------
 .../service/ProductService.java               |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
index f566d53..a11cb85 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductMapper.java
@@ -46,7 +46,7 @@ public interface TbProductMapper {
     @Update("update tb_product set stock_number=stock_number+#{num} WHERE id=#{id}")
     int incrStock(String id, int num);
 
-    @Update("update tb_product set stock_number=stock_number-#{num} WHERE id=#{id} and stock_number-#{num} > 0")
+    @Update("update tb_product set stock_number=stock_number-#{num} WHERE id=#{id} and stock_number-#{num} >= 0")
     int decrStock(String id, int num);
 
     @Update("update tb_product set stock_number=stock_number-#{num} WHERE id=#{id}")
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
index eadcfd0..e5c5a63 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java
@@ -44,7 +44,7 @@ public interface TbProductSkuMapper {
     @Update("update tb_product_sku set stock_number=stock_number+#{num} WHERE id=#{id}")
     int incrStock(String skuId, int addNum);
 
-    @Update("update tb_product_sku set stock_number=stock_number-#{num} WHERE id=#{id} and stock_number-#{num} > 0")
+    @Update("update tb_product_sku set stock_number=stock_number-#{num} WHERE id=#{id} and stock_number-#{num} >= 0")
     int decrStock(String id, int num);
 
     @Update("update tb_product_sku set stock_number=stock_number-#{num} WHERE id=#{id} ")
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index c8ec5f3..ef07d6a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -223,7 +223,7 @@ public class OrderService {
         }
 
 
-        skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()-number);
+//        skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()-number);
         skuWithBLOBs.setUpdatedAt(System.currentTimeMillis());
         tbProductSkuMapper.updateByPrimaryKey(skuWithBLOBs);
 
@@ -338,15 +338,15 @@ public class OrderService {
         if(ObjectUtil.isEmpty(product)){
             return Result.fail(CodeEnum.PRODUCTINFOERROR);
         }
-        if("1".equals(product.getIsStock().toString())){
-            TbProductSkuWithBLOBs skuWithBLOBs= tbProductSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
-            if(ObjectUtil.isEmpty(skuWithBLOBs)){
-                return Result.fail(CodeEnum.PRODUCTSKUERROR);
-            }
-            skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()+cashierCart.getTotalNumber());
-            skuWithBLOBs.setUpdatedAt(System.currentTimeMillis());
-            tbProductSkuMapper.updateByPrimaryKey(skuWithBLOBs);
-        }
+//        if("1".equals(product.getIsStock().toString())){
+//            TbProductSkuWithBLOBs skuWithBLOBs= tbProductSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
+//            if(ObjectUtil.isEmpty(skuWithBLOBs)){
+//                return Result.fail(CodeEnum.PRODUCTSKUERROR);
+//            }
+//            skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()+cashierCart.getTotalNumber());
+//            skuWithBLOBs.setUpdatedAt(System.currentTimeMillis());
+//            tbProductSkuMapper.updateByPrimaryKey(skuWithBLOBs);
+//        }
 
         List<String> skuIds=new ArrayList<>();
         skuIds.add(cashierCart.getSkuId());
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index ca6c907..3bf728e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -141,7 +141,7 @@ public class ProductService {
                     throw new MsgException("库存不足，下单失败");
                 }
             }else {
-                tbProductMapper.decrStockUnCheck(productId, decrNum);
+                tbProductSkuMapper.decrStockUnCheck(productId, decrNum);
             }
         }else {
             if (product.getIsStock() == 1) {