From 31f20090e5a176ba84de033e78e9414cbbfe606e Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 30 Oct 2024 17:59:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=89=E6=8B=A9=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BC=9A=E5=91=98=E7=9B=B8=E5=85=B3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/service/TbPayService.java | 3 ++-
 .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 7 ++++---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java      | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbPayService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbPayService.java
index e2dfd181..6fc11b4f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbPayService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbPayService.java
@@ -3,6 +3,7 @@ package cn.ysk.cashier.service;
 import cn.ysk.cashier.dto.ScanPayDTO;
 import cn.ysk.cashier.dto.shoptable.PayDTO;
 import cn.ysk.cashier.pojo.order.TbOrderInfo;
+import cn.ysk.cashier.pojo.shop.TbShopUser;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -12,7 +13,7 @@ import java.math.BigDecimal;
 public interface TbPayService {
     TbOrderInfo scanPay(Integer shopId, String code, Integer merchantId, Integer memberId, BigDecimal payMount, TbOrderInfo orderInfo);
 
-    void vipPay(BigDecimal payMount, Integer userId, Integer vipUserId);
+    TbShopUser vipPay(BigDecimal payMount, Integer vipUserId);
 
     TbOrderInfo cashPay(PayDTO payDTO);
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
index c1db2f3d..3bed9280 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
@@ -306,13 +306,12 @@ public class TbPayServiceImpl implements TbPayService {
     }
 
     @Override
-    public void vipPay(BigDecimal payMount, Integer userId, Integer vipUserId) {
+    public TbShopUser vipPay(BigDecimal payMount, Integer vipUserId) {
 
         // 扣减会员余额
         TbShopUser shopUser = shopUserMapper.selectOne(new LambdaUpdateWrapper<TbShopUser>()
                 .eq(TbShopUser::getStatus, 1)
-                .eq(TbShopUser::getId, vipUserId)
-                .eq(TbShopUser::getUserId, userId));
+                .eq(TbShopUser::getId, vipUserId));
 
         if (shopUser == null) {
             throw new BadRequestException("用户不存在或已被禁用");
@@ -333,6 +332,8 @@ public class TbPayServiceImpl implements TbPayService {
         userFlow.setType("-");
         shopUserFlowMapper.insert(userFlow);
 
+        return shopUser;
+
     }
 
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index c7241c53..0dde792c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1619,7 +1619,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     if (payDTO.getVipUserId() != null) {
                         orderInfo.setUserId(String.valueOf(payDTO.getVipUserId()));
                     }
-                    tbPayServiceImpl.vipPay(finalAmount, Integer.valueOf(orderInfo.getUserId()), payDTO.getVipUserId());
+                    TbShopUser shopUser = tbPayServiceImpl.vipPay(finalAmount, payDTO.getVipUserId());
+                    orderInfo.setMemberId(String.valueOf(shopUser.getId()));
+                    orderInfo.setUserId(shopUser.getUserId());
                     orderInfo.setPayOrderNo("vipPay".concat(SnowFlakeUtil.generateOrderNo()));
                     orderInfo.setPayType("deposit");
                     break;