From b860a6020d1c2bbddf83efa19933f61ea227b571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 18 Nov 2024 17:06:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=A1=8C=E5=85=B6=E4=BB=96=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 874e1ca..0629b37 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -558,7 +558,13 @@ public class PayService {
             return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。");
         }
 
-        TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId()));
+        TbShopUser user = tbShopUserMapper.selectByPrimaryKey(memberId);
+        if (ObjectUtil.isEmpty(user) || user.getIsVip() == null || !"1".equals(user.getIsVip().toString())) {
+//            return Result.failCode("会员卡余额不足","1");
+            return Result.success(CodeEnum.SUCCESS, "4");
+        }
+
+        TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(user.getUserId()));
         if (ObjectUtil.isEmpty(userInfo)) {
             return Result.fail("未获取到用户信息");
         }
@@ -583,11 +589,6 @@ public class PayService {
         }
 
 
-        TbShopUser user = tbShopUserMapper.selectByPrimaryKey(memberId);
-        if (ObjectUtil.isEmpty(user) || user.getIsVip() == null || !"1".equals(user.getIsVip().toString())) {
-//            return Result.failCode("会员卡余额不足","1");
-            return Result.success(CodeEnum.SUCCESS, "4");
-        }
 
         if (N.gt(orderInfo.getOrderAmount(), user.getAmount())) {
 //            return Result.failCode("会员卡余额不足","2");
@@ -615,6 +616,7 @@ public class PayService {
 
         orderInfo.setPayAmount(orderInfo.getOrderAmount());
         orderInfo.setMemberId(memberId);
+        orderInfo.setUserId(userInfo.getId().toString());
         orderInfo.setPayType("deposit");
         orderInfo.setStatus("closed");
         orderInfo.setPaidTime(System.currentTimeMillis());