From 3b592a0d191e64dfb48797a47fd0c2f70c583751 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 15:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=8C=E6=88=90=E5=B0=86?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=92=E7=BB=99=E5=AF=B9=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index cd8d697..fcd9395 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -188,7 +188,6 @@ public class PayService {
             return Result.fail("没有对应的商户");
         }
 
-
         List<TbCashierCart> cashierCarts = tbCashierCartMapper.selectByOrderId(orderId, null);
         if (ObjectUtil.isEmpty(cashierCarts) || ObjectUtil.isNull(cashierCarts)) {
             return Result.fail("购物车信息不存在");
@@ -199,13 +198,13 @@ public class PayService {
             body.append(cashierCart.getName());
         }
 
-
         TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getMerchantId()));
 
         if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
             return Result.fail("支付通道不存在");
         }
 
+        String userId = String.valueOf(TokenUtil.getUserId());
         TbOrderPayment payment = tbOrderPaymentMapper.selectByOrderId(orderId);
         if (ObjectUtil.isEmpty(payment) || payment == null) {
             payment = new TbOrderPayment();
@@ -254,7 +253,7 @@ public class PayService {
                     tbOrderPaymentMapper.updateByPrimaryKeySelective(payment);
                     orderInfo.setStatus("paying");
                     orderInfo.setPayOrderNo(payment.getTradeNumber());
-
+                    orderInfo.setUserId(userId);
 
                     tbOrderInfoMapper.updateByPrimaryKey(orderInfo);
                     //清除缓存购物车数据
@@ -294,7 +293,7 @@ public class PayService {
                         tbOrderPaymentMapper.updateByPrimaryKeySelective(payment);
                         orderInfo.setStatus("paying");
                         orderInfo.setPayOrderNo(payment.getTradeNumber());
-
+                        orderInfo.setUserId(userId);
 
                         tbOrderInfoMapper.updateByPrimaryKey(orderInfo);
                         //清除缓存购物车数据
@@ -398,6 +397,7 @@ public class PayService {
         orderInfo.setPayType("deposit");
         orderInfo.setStatus("closed");
         orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
+        orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
         //更新购物车状态
         int cartCount = tbCashierCartMapper.updateStatusByOrderId(orderId, "final");
@@ -704,6 +704,7 @@ public class PayService {
                                     orderInfo.setPayType("wx_lite");
                                     orderInfo.setPayOrderNo(payment.getTradeNumber());
                                     orderInfo.setPayAmount(orderInfo.getOrderAmount());
+                                    orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
                                     tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
 
@@ -756,6 +757,7 @@ public class PayService {
                                     orderInfo.setPayType("wx_lite");
                                     orderInfo.setPayOrderNo(payment.getTradeNumber());
                                     orderInfo.setPayAmount(orderInfo.getOrderAmount());
+                                    orderInfo.setUserId(String.valueOf(TokenUtil.getUserId()));
                                     tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);