From 27ce12d3ed00ed5d70ce785653a16db092c3ef88 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 28 八月 2025 21:33:27 +0800 Subject: [PATCH] bug修改 --- cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 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 c3f74a1..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 @@ -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; @@ -296,7 +297,6 @@ @ResponseBody @PostMapping("/base/appUser/loginSMSCode") @ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"}) - public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) { try { return appUserService.loginSMSCode(loginSMSCodeVo); @@ -473,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版本回调 @@ -751,4 +762,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