From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 6bd2591..8e09a9d 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
@@ -6,17 +6,11 @@
import com.dsh.account.dto.BindDto;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.dto.UpdateInfoDto;
-import com.dsh.account.entity.Coach;
-import com.dsh.account.entity.TAppUser;
-import com.dsh.account.entity.TCourseInfoRecord;
-import com.dsh.account.entity.UserIntegralChanges;
+import com.dsh.account.entity.*;
import com.dsh.account.model.*;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.QueryAppUserVO;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.TAppUserService;
-import com.dsh.account.service.TCourseInfoRecordService;
-import com.dsh.account.service.UserIntegralChangesService;
+import com.dsh.account.service.*;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -121,11 +115,29 @@
@RequestMapping("/base/appUser/listAll")
public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){
List<QueryAppUserVO> queryAppUserVOS = appUserService.listAll(query);
+ ArrayList<QueryAppUserVO> res = new ArrayList<>();
+
if (query.getUserIds()!=null && query.getUserIds().size()!=0){
List<QueryAppUserVO> queryAppUserVOS1 = appUserService.listAll1(query);
queryAppUserVOS.addAll(queryAppUserVOS1);
}
- return queryAppUserVOS.stream().distinct().collect(Collectors.toList());
+ List<QueryAppUserVO> collect = queryAppUserVOS.stream().distinct().collect(Collectors.toList());
+ for (QueryAppUserVO vo : collect) {
+ // 会员到期时间小于当前时间或者会员到期时间为null 则会员过期
+ if (vo.getVipEndTime()!=null && vo.getVipEndTime().after(new Date())){
+ vo.setIsVip(1);
+ }else{
+ vo.setIsVip(0);
+ }
+ if (query.getIsVip() != null && (!query.getIsVip().equals("")) ){
+ if (vo.getIsVip() == query.getIsVip()){
+ res.add(vo);
+ }
+ }else{
+ res.add(vo);
+ }
+ }
+ return res;
}
/**
@@ -162,6 +174,28 @@
}
+ @Autowired
+ private TStudentService studentService;
+ @ResponseBody
+ @PostMapping("/base/appUser/logOff")
+ @ApiOperation(value = "注销", tags = {"注销"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "账号id", name = "appId", dataType = "int", required = true)
+ })
+ public ResultUtil<String> logOff(Integer appId){
+ try {
+
+ appUserService.removeById(appId);
+ studentService.remove(new QueryWrapper<TStudent>().eq("appUserId",appId));
+
+ return ResultUtil.success("注销成功");
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@PostMapping("/base/appUser/addAppUser")
@ApiOperation(value = "注册用户", tags = {"APP-登录注册"})
--
Gitblit v1.7.1