From f976fd649c742d5d785f1b623e069d19ee20f6aa Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 08 八月 2024 16:19:40 +0800
Subject: [PATCH] 8.8
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index c261e65..8b9cc32 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -4,11 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.UnitListQueryDto;
+import com.ruoyi.account.api.dto.UserListQueryDto;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserTag;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.service.TAppUserService;
+import com.ruoyi.account.service.TAppUserTagService;
+import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.feignClient.OtherClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -16,6 +22,13 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -33,7 +46,11 @@
private OtherClient otherClient;
@Resource
private TAppUserService appUserService;
+ @Resource
+ private TAppUserTagService appUserTagService;
+ @Resource
+ private TAppUserVipDetailService tAppUserVipDetailService;
@ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
@PostMapping(value = "/unit/page")
public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
@@ -63,21 +80,103 @@
}
- @ApiOperation(value = "用户列表", tags = {"用户管理-用户管理"})
+ @ApiOperation(value = "用户列表", tags = {"用户管理-用户列表"})
@PostMapping(value = "/user/page")
- public R<Page<TCompany>> userPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+ public R<Page<TAppUser>> userPage(@RequestBody UserListQueryDto userListQueryDto) {
+ List<Long> userIds = new ArrayList<>();
- //拿到标签tag
+ //如果要筛选标签。用标签获取useids
+ if (userListQueryDto.getUserTagId() != null){
+ userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
+ }
- //拿到会员map
+
//列表查询
+ Page<TAppUser> page = appUserService.lambdaQuery()
+ .like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
+ .eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
+ .eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus())
+ .eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
+ .in(!userIds.isEmpty(),TAppUser::getId,userIds)
+ .page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
+
+ if (page.getRecords().isEmpty()){
+ return R.ok(page);
+ }
+ List<Integer> vipIds = new ArrayList<>();
+ vipIds = page.getRecords().stream().map(TAppUser::getVipId).collect(Collectors.toList());
+ //获取会员map
+ R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
+ //循环处理
+ for (TAppUser appUser : page.getRecords()) {
+ //拿到最新的tagId
+ TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
+ //设置最新的tagName
+ R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
+ if (byIdTag.getData()!=null) {
+ appUser.setTagName(byIdTag.getData().getName());
+ }
+ //匹配vipMap的值
+ appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ }
+ return R.ok(page);
+ }
+ @ApiOperation(value = "用户添加编辑", tags = {"用户管理-用户列表"})
+ @PostMapping(value = "/user/addOrUpdate")
+ public R addOrUpdate(@RequestBody TAppUser tAppUser) {
+ if (tAppUser.getId() != null){
+ //为编辑操作，要进行vip的逻辑处理
+ TAppUser nowUser = appUserService.getById(tAppUser.getId());
+ //会员结束时间不为空
+ if (tAppUser.getVipEndTime()!=null&&tAppUser.getVipEndTime()!=nowUser.getVipEndTime()){
+ //计算改变后的结束时间和当前结束时间差距了多少时间
+ Duration duration = Duration.between(tAppUser.getVipEndTime(), nowUser.getVipEndTime());
+ List<TAppUserVipDetail> detailList = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, tAppUser.getId()).gt(TAppUserVipDetail::getEndTime, LocalDateTime.now()).orderByAsc(TAppUserVipDetail::getStartTime).list();
+ //如果是增加，则将明细表里当前会员的结束时间往后移，并将其余未开始会员的开始时间和结束时间往后移
+ if (tAppUser.getVipEndTime().isAfter(nowUser.getVipEndTime())){
+ for (int i = 0; i < detailList.size(); i++) {
+ TAppUserVipDetail tAppUserVipDetail = detailList.get(i);
+ if (i == 0 ){
+ tAppUserVipDetail.setEndTime(tAppUser.getVipEndTime().plus(duration));
+ }else {
+ tAppUserVipDetail.setStartTime(tAppUserVipDetail.getStartTime().plus(duration));
+ tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plus(duration));
+ }
+ }
+ }else {
+ //如果是减少，将当前会员结束时间减少，并将其余会员开始和结束时间都往前移动
+ for (int i = 0; i < detailList.size(); i++) {
+ TAppUserVipDetail tAppUserVipDetail = detailList.get(i);
+ if (i == 0 ){
+ tAppUserVipDetail.setEndTime(tAppUser.getVipEndTime().minus(duration));
+ }else {
+ tAppUserVipDetail.setStartTime(tAppUserVipDetail.getStartTime().minus(duration));
+ tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().minus(duration));
+ }
+ }
+ }
+ }
+ }
+ appUserService.saveOrUpdate(tAppUser);
return R.ok();
}
+// @ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"})
+// @PostMapping(value = "/user/detail/{id}")
+// public R userDetail(@PathVariable Long id) {
+// TAppUser user = appUserService.getById(id);
+// if (user.getVipId()!=null) {
+// R<Map<Integer, String>> vipMap = otherClient.getVipMap(Arrays.asList(user.getVipId()));
+// user.setVipName(vipMap.getData().get(user.getVipId()));
+// }
+// //获取累计充电数量
+//
+// }
}
--
Gitblit v1.7.1