From 6b1afd7d26abadf234e5f7e29b0fa42166989caa Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 15:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=8D=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8D=95=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 22ca574..61394dd 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -670,6 +670,8 @@ public class CartService {
             HashMap<String, TbOrderDetail> oldOrderDetailMap = new HashMap<>();
             oldOrderDetailList.forEach(item -> oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item));
 
+
+            boolean hasNewInfo = false;
             //校验 库存 耗材
             for (TbCashierCart cart : cashierCartList) {
                 // 设置用餐类型
@@ -748,6 +750,7 @@ public class CartService {
                 TbOrderDetail orderDetail = oldOrderDetailMap.get(cart.getOrderId() + cart.getId());
                 if (orderDetail == null) {
                     orderDetail = new TbOrderDetail();
+                    hasNewInfo = true;
                 }
                 orderDetail.setCreateTime(new Date());
                 orderDetail.setNum(cart.getNumber());
@@ -899,7 +902,9 @@ public class CartService {
                 orderInfo.setIsUseCoupon(isuseYhq);
                 orderInfo.setRemark(remark);
                 orderInfo.setUserId(userId);
-                orderInfo.setPlaceNum(currentPlaceNum);
+                if (hasNewInfo) {
+                    orderInfo.setPlaceNum(currentPlaceNum);
+                }
                 orderInfo.setUseType(shopEatTypeInfoDTO.getUseType());
                 orderInfo.setSeatCount(seatNum);
                 orderInfo.setSeatAmount(seatCost);