From 6f91919a81c92766cb6a119dfe099b83a22ef446 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 15 八月 2024 11:59:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 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 5605d42..b8205c8 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
@@ -1,15 +1,20 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.*;
import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.GiveVipUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
@@ -64,6 +69,14 @@
@Resource
private ExchangeOrderClient exchangeOrderClient;
+
+
+
+ @ApiOperation(value = "管理后台-根据手机号查询用户ids", tags = {"管理后台-活动费用统计"})
+ @PostMapping(value = "/user/getUserIdsByPhone")
+ public R<List<Long>> getUserIdsByPhone(@RequestParam("phone") String phone) {
+ return R.ok(appUserService.list(new QueryWrapper<TAppUser>().like("phone",phone)).stream().map(TAppUser::getId).collect(Collectors.toList()));
+ }
@Resource
private GiveVipUtil giveVipUtil;
@ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
@@ -138,6 +151,48 @@
return R.ok(page);
}
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券发放-选择人员")
+ @PostMapping("/choiceUser")
+ public R<Page<TAppUser>> choiceUser(@RequestBody ChoiceUserListQueryDto userListQueryDto) {
+ List<Long> userIds = new ArrayList<>();
+ //如果要筛选标签。用标签获取useids
+ if (userListQueryDto.getUserTagId() != null){
+ String[] split = userListQueryDto.getUserTagId().split(",");
+ userIds = appUserTagService.lambdaQuery().in(TAppUserTag::getUserTagId, Arrays.asList(split)).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
+ }
+ //列表查询
+ Page<TAppUser> page = appUserService.lambdaQuery()
+ .like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
+ .eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
+ .eq(userListQueryDto.getProvinceCode() != null && !"".equals(userListQueryDto.getProvinceCode()), TAppUser::getProvinceCode, userListQueryDto.getProvinceCode())
+ .in(!userIds.isEmpty(),TAppUser::getId,userIds)
+ .eq(TAppUser::getStatus,1)
+ .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()));
+ //累计充电次数
+ R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
+ appUser.setOrderCount(useOrderCount.getData());
+
+ }
+ return R.ok(page);
+ }
@ApiOperation(value = "用户添加编辑", tags = {"用户管理-用户列表"})
@@ -251,6 +306,14 @@
appUserService.updateById(appUser);
return R.ok();
}
+// @ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
+// @PostMapping(value = "/user/info")
+// public R info() {
+// Long userId = 1L;
+// TAppUser byId = appUserService.getById(userId);
+//
+//
+// }
@ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
@@ -260,11 +323,11 @@
int plusDay = 0;
if (giveVipDto.getType() == 1) {
- plusDay = 31;
+ plusDay = 1;
} else if (giveVipDto.getType() == 2) {
- plusDay = 93;
+ plusDay = 3;
} else if (giveVipDto.getType() == 3) {
- plusDay = 365;
+ plusDay = 12;
}
//增加vipDetail
giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay);
@@ -275,5 +338,27 @@
return R.ok();
}
+
+ /**
+ * 根据用户id查询用户信息
+ * @param appUserIds 用户id
+ * @return
+ */
+ @PostMapping(value = "/user/getUserByIds")
+ public R<List<TAppUser>> getUserByIds(@RequestBody List<Long> appUserIds){
+ return R.ok(appUserService.list(Wrappers.<TAppUser>lambdaQuery().in(TAppUser::getId,appUserIds)));
+ }
+
+
+ /**
+ * 根据用户id获取用户
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/user/getUserById/{id}")
+ public R<TAppUser> getUserById(@PathVariable Long id){
+ TAppUser appUser = appUserService.getById(id);
+ return R.ok(appUser);
+ }
}
--
Gitblit v1.7.1