From 7636df43943f0a00c4e61659ea81ffa86d67f11f Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 09:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BA=97=E9=93=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/OrderVo.java       |  2 ++
 .../system/cashierservice/service/CartService.java     | 10 ++++------
 .../system/cashierservice/service/OrderService.java    |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
index c867d48..cda221d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
@@ -39,4 +39,6 @@ public class OrderVo {
 
     private String useType;
 
+    private Integer shopId;
+
 }
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 9b56805..6e9603e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -555,6 +555,7 @@ public class CartService {
             cashierCart.setUpdatedAt(Instant.now().toEpochMilli());
             cashierCart.setPackFee(BigDecimal.ZERO);
             cashierCart.setRefundNumber(0);
+            cashierCart.setTradeDay(DateUtils.getDay());
             if(isVip==1){
                 cashierCart.setIsVip(Byte.parseByte("1"));
                 cashierCart.setTotalAmount(BigDecimal.ZERO);
@@ -776,10 +777,6 @@ public class CartService {
                 }
 
                 orderDetails.add(orderDetail);
-                if (StringUtils.isNotEmpty(cart.getOrderId())) {
-                    orderId = Integer.valueOf(cart.getOrderId());
-                }
-
                 cart.setStatus(shopEatTypeInfoDTO.isDineInAfter() ? "create" : "final");
                 if (cart.getId() != null) {
                     mpCashierCartMapper.updateById(cart);
@@ -853,7 +850,8 @@ public class CartService {
 
             // 设置餐位费
             TbShopInfo shopInfo = mpShopInfoMapper.selectById(shopId);
-            if (!shopEatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0 && (orderInfo == null || orderInfo.getSeatCount() == null)) {
+            if (!shopEatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
+                    && (orderInfo == null || orderInfo.getSeatCount() == null)) {
                 seatNum = jsonObject.getInteger("dinersNum");
                 if (seatNum == null) {
                     MsgException.throwException("dinersNum不能为空");
@@ -939,7 +937,7 @@ public class CartService {
             }
 
             for (TbOrderDetail orderDetail : orderDetails) {
-                orderDetail.setOrderId(orderId);
+                orderDetail.setOrderId(orderInfo.getId());
                 if (orderDetail.getId() != null) {
                     mpOrderDetailMapper.updateById(orderDetail);
                 }else {
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 cdb71b1..f83424b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -221,6 +221,7 @@ public class OrderService {
         orderVo.setSendType(orderInfo.getSendType());
         orderVo.setOutNumber(orderInfo.getOutNumber());
         orderVo.setUseType(orderInfo.getUseType());
+        orderVo.setShopId(Integer.valueOf(orderInfo.getShopId()));
 
         return Result.success(CodeEnum.ENCRYPT, orderVo);
     }