From 1aa729dc918126262f636702e0581cd298ef419a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 10 Oct 2024 15:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=B1=E4=BA=AB=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index fc7c1c3..676c4a0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -895,16 +895,15 @@ public class CartService {
                     log.info("下单,开始校验库存预警,购物车id:{}", cart.getId());
                     CompletableFuture.runAsync(() -> checkWarnLineAndSendMsg(tbProduct, tbProduct1, cart.getNumber()));
 
-
                     log.info("开始修改库存，商品id：{}，商品名：{}", tbProduct1.getId(), tbProduct1.getName());
                     // 修改库存
                     try {
                         // 首次下单扣除库存
                         if (StrUtil.isBlank(cart.getOrderId())) {
                             if (tbProduct1.getIsStock() == 1) {
-                                productService.updateStock(tbProduct.getProductId(), tbProduct.getId(), cart.getNumber(), tbProduct1.getIsDistribute() == 1);
+                                productService.updateStock(tbProduct.getProductId(), tbProduct.getId(), cart.getNumber(), true);
                             } else {
-                                productService.updateStockAndNoCheck(tbProduct.getProductId(), tbProduct.getId(), cart.getNumber(), tbProduct1.getIsDistribute() == 1);
+                                productService.updateStockAndNoCheck(tbProduct.getProductId(), tbProduct.getId(), cart.getNumber(), true);
                             }
                         }
 
@@ -914,7 +913,7 @@ public class CartService {
                         jsonObject1.put("msg", tbProduct1.getName() + "库存不足");
                         jsonObject1.put("data", new ArrayList<>());
                         PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true);
-                        continue;
+                        throw new MsgException((String) jsonObject1.get("msg"));
                     }
                     saleAmount = saleAmount.add(tbProduct.getSalePrice());
                 } else {