From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 228d6a4..e51e3ed 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -297,7 +297,6 @@
@ResponseBody
@PostMapping("/base/appUser/loginSMSCode")
@ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"})
-
public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) {
try {
return appUserService.loginSMSCode(loginSMSCodeVo);
@@ -474,15 +473,26 @@
VipPaymentVO res = new VipPaymentVO();
res.setHeadImg(appUser.getHeadImg());
res.setName(appUser.getName());
- res.setIsVip(appUser.getIsVip());
+ res.setVipEndTime(appUser.getVipEndTime());
+ if (appUser.getVipEndTime()==null){
+ res.setIsVip(0);
+ }else if (appUser.getVipEndTime().before(new Date())){
+ res.setIsVip(0);
+ }else{
+ res.setIsVip(1);
+ }
+ appUserService.updateById(appUser);
List<Vip> vips = vipClient.listAll();
res.setVipList(vips);
+
+ return ResultUtil.success(res);
+
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
- return ResultUtil.success();
}
+
//
// /**
// * 购买年度会员支付微信回调V3版本回调
--
Gitblit v1.7.1