From 59ea0c5d5da0cbb570efc2ecf63ff7111d023344 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 12 Mar 2025 15:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/user/UserOrderController.java | 2 --
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
index b26122b78..e9fd97a94 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
@@ -60,8 +60,6 @@ public class UserOrderController {
     @Debounce(value = "#addDto.tableCode")
     public CzgResult<OrderInfo> createOrder(@RequestBody OrderInfoAddDTO addDto) {
         addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
-        long loginIdAsLong = StpKit.USER.getLoginIdAsLong();
-        log.info("获取到的用户Id为:{}", loginIdAsLong);
 //        addDto.setUserId(StpKit.USER.getLoginIdAsLong());
         addDto.setShopId(StpKit.USER.getShopId());
         addDto.setOrderType("miniapp");
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 30fa696d0..f83d0a31b 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -667,7 +667,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private OrderInfo initOrderInfo(OrderInfoAddDTO param, ShopInfo shopInfo, ShopTable table) {
         OrderInfo orderInfo = new OrderInfo();
         if (param.getOrderId() != null) {
-            orderInfo.setUserId(param.getUserId());
             orderInfo = getById(param.getOrderId());
             if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) {
                 throw new ValidateException("生成订单失败，订单已结束，请重新下单");
@@ -675,7 +674,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         } else {
             orderInfo.setOrderNo(param.getPlatformType() + IdUtil.getSnowflakeNextId());
             orderInfo.setShopId(param.getShopId());
-            orderInfo.setUserId(param.getUserId());
             if (table != null) {
                 orderInfo.setTableCode(table.getTableCode());
                 orderInfo.setTableName(table.getName());
@@ -703,6 +701,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setSeatAmount(shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum())));
             orderInfo.setSeatNum(param.getSeatNum());
         }
+        orderInfo.setUserId(param.getUserId());
         orderInfo.setTableCode(param.getTableCode());
         orderInfo.setPlaceNum(param.getPlaceNum());
         orderInfo.setOriginAmount(param.getOriginAmount());