From 8f37a2de432a8d4d77f94dcf45d0b86ce3006ee2 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 14:47:35 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 c3f74a1..23c9176 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
@@ -18,6 +18,7 @@
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
import com.dsh.account.model.QueryByNamePhone;
+import com.dsh.account.model.query.UserDetailsOfSearch;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.QueryAppUserVO;
import com.dsh.account.service.IVipPaymentService;
@@ -473,7 +474,14 @@
VipPaymentVO res = new VipPaymentVO();
res.setHeadImg(appUser.getHeadImg());
res.setName(appUser.getName());
- res.setIsVip(appUser.getIsVip());
+ 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);
} catch (Exception e) {
@@ -751,4 +759,22 @@
List<TAppUser> list = appUserService.list(queryWrapper);
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
+
+
+ @PostMapping("/appUser/queryAppUserByIds")
+ @ResponseBody
+ public List<TStudent> queryAppUserByIds(@RequestBody UserDetailsOfSearch search){
+ LambdaQueryWrapper<TStudent> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(search.getIdCard())){
+ tAppUserLambdaQueryWrapper.eq(TStudent::getIdCard, search.getIdCard());
+ }
+ if(ToolUtil.isNotEmpty(search.getPhone())){
+ tAppUserLambdaQueryWrapper.eq(TStudent::getPhone, search.getPhone());
+ }
+ if(ToolUtil.isNotEmpty(search.getName())){
+ tAppUserLambdaQueryWrapper.eq(TStudent::getName, search.getName());
+ }
+ tAppUserLambdaQueryWrapper.in(TStudent::getId,search.getUseIds());
+ return studentService.list(tAppUserLambdaQueryWrapper);
+ }
}
--
Gitblit v1.7.1