From 46f5b10337e20e616ec81adceab482593383043e Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 26 Oct 2024 16:41:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=99=E9=A2=9D=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9C=B8=E7=8E=8B=E9=A4=90=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/PayController.java         | 2 +-
 .../system/cashierservice/entity/dto/MemberInDTO.java           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
index cfb1af6..c5c8348 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -155,7 +155,7 @@ public class PayController {
             if(memberInDTO.getAmount() != null && memberInDTO.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
                 return Result.fail("充值金额不能小于等于0");
             }
-
+            memberInDTO.setUserId(TokenUtil.getUserId());
             memberInDTO.setOpenId(openId);
             return payService.memberIn(memberInDTO, IpUtil.getIpAddr(request));
         } catch (JsonProcessingException e) {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/MemberInDTO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/MemberInDTO.java
index e33e920..eaa1cb4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/MemberInDTO.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/MemberInDTO.java
@@ -13,7 +13,6 @@ import java.util.List;
 public class MemberInDTO {
     @NotNull
     private Integer shopId;
-    @NotNull(message = "用户信息不允许为空")
     private Integer userId;
 //    @NotBlank(message = "用户信息不允许为空")
     private String openId;