From c98096bd3b19f30febc92baab1f3428383c17965 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 16:52:27 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 480 +++++++++++++++++++++++++++++------------------------------
1 files changed, 235 insertions(+), 245 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 384d2d1..9b520dd 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
@@ -1,40 +1,34 @@
package com.dsh.account.controller;
-import cn.hutool.core.date.DateUtil;
+import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.account.dto.BindDto;
+import com.dsh.account.dto.IntroduceUserQuery;
import com.dsh.account.dto.SelectDto;
-import com.dsh.account.dto.UserInfoQueryDTO;
-import com.dsh.account.entity.Coach;
-import com.dsh.account.entity.TAppUser;
-import com.dsh.account.entity.TCourseInfoRecord;
+import com.dsh.account.dto.UpdateInfoDto;
+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.util.*;
-import com.dsh.account.vo.GroupCityInfoVO;
-import com.dsh.account.vo.UserInfoQueryVO;
-import com.dsh.account.vo.entity.DayData;
-import com.dsh.account.vo.entity.MonthData;
-import com.dsh.account.vo.entity.WeekData;
-import com.dsh.account.vo.entity.YearData;
+import com.dsh.account.service.*;
+import com.dsh.account.util.PayMoneyUtil;
+import com.dsh.account.util.ResultUtil;
+import com.dsh.account.util.TokenUtil;
+import com.dsh.account.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
import java.util.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -60,56 +54,85 @@
private TCourseInfoRecordService courseInfoRecordService;
@Autowired
- private RedisUtil redisUtil;
+ private TAppGiftService appGiftService;
+
+ /**
+ * 根据介绍有礼id查询当前活动参与次数
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/getActivityPeoples")
+ public Integer getActivityPeoples(@RequestBody Integer activityId) {
+ int activityId1 = appGiftService.list(new QueryWrapper<TAppGift>().eq("activityId", activityId))
+ .size();
+ return activityId1;
+ }
+
+ /**
+ * 介绍有礼 -- 参与用户列表
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/queryIntroduceAll")
+ public List<IntroduceUser> queryIntroduceAll(@RequestBody IntroduceUserQuery query) {
+ return appGiftService.queryIntroduceAll(query);
+ }
/**
* 获取所有用户
*/
@ResponseBody
@PostMapping("/base/appUser/queryAppUserList")
- public List<TAppUser> queryAppUserList(@RequestBody AppUserByNameAndPhoneDTO dto){
+ public List<TAppUser> queryAppUserList(@RequestBody AppUserByNameAndPhoneDTO dto) {
return appUserService.queryAPPUserByNameAndPhone(dto);
}
+
/**
* 根据用户姓名和电话模糊查询
*/
@ResponseBody
@PostMapping("/base/appUser/queryAPPUserByNameAndPhone")
- public List<TAppUser> queryAPPUserByNameAndPhone(@RequestBody AppUserByNameAndPhoneDTO dto){
+ public List<TAppUser> queryAPPUserByNameAndPhone(@RequestBody AppUserByNameAndPhoneDTO dto) {
return appUserService.queryAPPUserByNameAndPhone(dto);
}
+
/**
* 根据用户id获取用户信息
+ *
* @param appUserId
* @return
*/
@ResponseBody
@PostMapping("/base/appUser/queryAppUser1")
- public TAppUser queryAppUser1(@RequestBody Integer appUserId){
- TAppUser appUser = appUserService.getById(appUserId);
- return appUser;
+ public TAppUser queryAppUser1(@RequestBody Integer appUserId) {
+ TAppUser appUser = appUserService.getById(appUserId);
+ return appUser;
}
+
/**
* 冻结/解冻 1=解冻 2=冻结
*/
@RequestMapping("/base/appUser/changeState")
- public Object changeState(@RequestBody AdvertisementChangeStateDTO dto){
+ public Object changeState(@RequestBody AdvertisementChangeStateDTO dto) {
return appUserService.changeState(dto);
}
+
/**
- * 后台添加
+ * 后台添加
*/
@RequestMapping("/base/appUser/addAppUser1")
- public Object addAppUser1(@RequestBody TAppUser query){
+ public Object addAppUser1(@RequestBody TAppUser query) {
// 修改
- if (query.getId()!=null){
- TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()).ne("id",query.getId()));
- if (null != phone){
+ if (query.getId() != null) {
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()).ne("id", query.getId()));
+ if (null != phone) {
+ return 5001;
+ }
+ } else {
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()));
+ if (null != phone) {
return 5001;
}
}
query.setIsVip(0);
- query.setPassword("111111");
query.setInsertTime(new Date());
return appUserService.saveOrUpdate(query);
}
@@ -117,10 +140,33 @@
/**
* 获取用户信息列表数据
*/
+ @ResponseBody
@RequestMapping("/base/appUser/listAll")
- public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){
+ public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query) {
+ List<QueryAppUserVO> queryAppUserVOS = appUserService.listAll(query);
+ ArrayList<QueryAppUserVO> res = new ArrayList<>();
- return appUserService.listAll(query);
+ if (query.getUserIds() != null && query.getUserIds().size() != 0) {
+ List<QueryAppUserVO> queryAppUserVOS1 = appUserService.listAll1(query);
+ queryAppUserVOS.addAll(queryAppUserVOS1);
+ }
+ 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;
}
/**
@@ -128,11 +174,12 @@
*/
@ResponseBody
@GetMapping("/base/appUser/getAppUserByPhone/{phone}")
- public TAppUser getAppUserByPhone(@PathVariable("phone") String phone){
+ public TAppUser getAppUserByPhone(@PathVariable("phone") String phone) {
TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", phone));
return appUser;
}
+ // todo 短信验证码
@ResponseBody
@PostMapping("/base/appUser/getSMSCode")
@ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
@@ -140,17 +187,40 @@
@ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true)
})
- public ResultUtil getSMSCode(Integer type, String phone){
- if(ToolUtil.isEmpty(phone)){
+ public ResultUtil getSMSCode(Integer type, String phone) {
+ if (ToolUtil.isEmpty(phone)) {
return ResultUtil.paranErr("phone");
}
- if(ToolUtil.isEmpty(type)){
+ if (ToolUtil.isEmpty(type)) {
return ResultUtil.paranErr("type");
}
try {
ResultUtil smsCode = appUserService.getSMSCode(type, phone);
return smsCode;
- }catch (Exception e){
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @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();
}
@@ -162,10 +232,10 @@
@ApiOperation(value = "注册用户", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil addAppUser(AddAppUserVo addAppUserVo){
+ public ResultUtil addAppUser(AddAppUserVo addAppUserVo) {
try {
return appUserService.addAppUser(addAppUserVo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -179,21 +249,20 @@
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true),
@ApiImplicitParam(value = "登录密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil<String> loginPassword(String phone, String password){
- if(ToolUtil.isEmpty(phone)){
+ public ResultUtil<String> loginPassword(String phone, String password) {
+ if (ToolUtil.isEmpty(phone)) {
return ResultUtil.paranErr("phone");
}
- if(ToolUtil.isEmpty(password)){
+ if (ToolUtil.isEmpty(password)) {
return ResultUtil.paranErr("password");
}
try {
return appUserService.loginPassword(phone, password);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -201,10 +270,24 @@
@ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo){
+ public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) {
try {
return appUserService.loginSMSCode(loginSMSCodeVo);
- }catch (Exception e){
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/base/appUser/bind")
+ @ApiOperation(value = "微信登录绑定手机号", tags = {"APP-登录注册"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil bind(BindDto dto) {
+ try {
+ return appUserService.bind(dto);
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -216,38 +299,33 @@
@ApiOperation(value = "微信登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginWeChat(LoginWeChatVo loginWeChatVo){
+ public ResultUtil<String> loginWeChat(LoginWeChatVo loginWeChatVo) {
try {
return appUserService.loginWechat(loginWeChatVo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
@ResponseBody
- @PostMapping("/base/appUser/bind")
- @ApiOperation(value = "微信登录--绑定手机号", tags = {"APP-登录注册"})
+ @PostMapping("/api/appUser/updateInfo")
+ @ApiOperation(value = "修改个人信息", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> bind(String phone,String openId,String code){
+ public ResultUtil<String> updateInfo(UpdateInfoDto dto) {
try {
- String value = redisUtil.getValue(phone);
- if(!code.equals(value)){
- return ResultUtil.error("验证码无效", "");
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
}
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getOpenid, openId));
- TAppUser tAppUser = list.get(0);
- tAppUser.setPhone(phone);
- appUserService.updateById(tAppUser);
- return ResultUtil.success();
- }catch (Exception e){
+ return appUserService.updateInfo(dto, uid);
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
@ResponseBody
@@ -258,19 +336,19 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil updatePassword(String phone, String code, String password){
- if(ToolUtil.isEmpty(phone)){
+ public ResultUtil updatePassword(String phone, String code, String password) {
+ if (ToolUtil.isEmpty(phone)) {
return ResultUtil.paranErr("phone");
}
- if(ToolUtil.isEmpty(code)){
+ if (ToolUtil.isEmpty(code)) {
return ResultUtil.paranErr("code");
}
- if(ToolUtil.isEmpty(password)){
+ if (ToolUtil.isEmpty(password)) {
return ResultUtil.paranErr("password");
}
try {
return appUserService.updatePassword(phone, code, password);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -285,24 +363,23 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil forgetPassword(String phone, String code, String password){
- if(ToolUtil.isEmpty(phone)){
+ public ResultUtil forgetPassword(String phone, String code, String password) {
+ if (ToolUtil.isEmpty(phone)) {
return ResultUtil.paranErr("phone");
}
- if(ToolUtil.isEmpty(code)){
+ if (ToolUtil.isEmpty(code)) {
return ResultUtil.paranErr("code");
}
- if(ToolUtil.isEmpty(password)){
+ if (ToolUtil.isEmpty(password)) {
return ResultUtil.paranErr("password");
}
try {
return appUserService.updatePassword(phone, code, password);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -313,22 +390,20 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
+ public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat) {
+
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
JoinPlayPaiVo joinPlayPaiVo = appUserService.queryJoinPlayPai(uid, lon, lat);
return ResultUtil.success(joinPlayPaiVo);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
@ResponseBody
@@ -338,50 +413,47 @@
@ApiImplicitParam(value = "支付方式（1=微信，2=支付宝）", name = "payType", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addVipPayment(Integer payType){
- if(ToolUtil.isEmpty(payType)){
+ public ResultUtil addVipPayment(Integer payType) {
+ if (ToolUtil.isEmpty(payType)) {
return ResultUtil.paranErr("payType");
}
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
return vipPaymentService.addVipPayment(uid, payType);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
-
/**
* 购买年度会员支付微信回调
+ *
* @param request
* @param response
*/
@ResponseBody
@PostMapping("/base/appUser/addVipPaymentWeChatCallback")
- public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
+ public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
String result = map.get("result");
ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, transaction_id);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write(result);
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -389,26 +461,28 @@
/**
* 购买年度会员支付支付宝回调
+ *
* @param request
* @param response
*/
@ResponseBody
@PostMapping("/base/appUser/addVipPaymentAliCallback")
- public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){
+ public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
+ String appUserId = map.get("passback_params");
ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, trade_no);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write("success");
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -416,32 +490,46 @@
/**
* 根据用户id获取用户信息
+ *
* @param appUserId
* @return
*/
@ResponseBody
@PostMapping("/base/appUser/queryAppUser")
- public TAppUser queryAppUser(@RequestBody Integer appUserId){
+ public TAppUser queryAppUser(@RequestBody Integer appUserId) {
try {
TAppUser appUser = appUserService.getById(appUserId);
return appUser;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
}
+ @Autowired
+ private UserIntegralChangesService userIntegralChangesService;
+
/**
* 修改用户信息
+ *
* @param appUser
*/
@ResponseBody
@PostMapping("/base/appUser/updateAppUser")
- public void updateAppUser(@RequestBody TAppUser appUser){
+ public void updateAppUser(@RequestBody TAppUser appUser) {
try {
appUserService.updateById(appUser);
- }catch (Exception e){
+ UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
+ userIntegralChanges.setAppUserId(appUser.getId());
+ userIntegralChanges.setOldIntegral(appUser.getIntegral() + appUser.getPoints());
+ userIntegralChanges.setType(5);
+ userIntegralChanges.setNewIntegral(appUser.getIntegral());
+ userIntegralChanges.setInsertTime(new Date());
+ userIntegralChanges.setCategory(2);
+ userIntegralChangesService.save(userIntegralChanges);
+
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -449,206 +537,108 @@
@PostMapping("/base/appUser/getAllUser")
@ResponseBody
- public List<TAppUser> getAllUser(){
+ public List<TAppUser> getAllUser() {
try {
return appUserService.list();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
}
@PostMapping("/base/appUser/queryByNamePhone")
- public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
+ public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone) {
try {
LambdaQueryWrapper<TAppUser> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(ToolUtil.isNotEmpty(queryByNamePhone.getName())){
- tAppUserLambdaQueryWrapper.like(TAppUser::getName,queryByNamePhone.getName());
+ if (ToolUtil.isNotEmpty(queryByNamePhone.getName())) {
+ tAppUserLambdaQueryWrapper.like(TAppUser::getName, queryByNamePhone.getName());
}
- if(ToolUtil.isNotEmpty(queryByNamePhone.getPhone())){
- tAppUserLambdaQueryWrapper.like(TAppUser::getPhone,queryByNamePhone.getPhone());
+ if (ToolUtil.isNotEmpty(queryByNamePhone.getPhone())) {
+ tAppUserLambdaQueryWrapper.like(TAppUser::getPhone, queryByNamePhone.getPhone());
}
List<TAppUser> list = appUserService.list(tAppUserLambdaQueryWrapper);
return list;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
}
@PostMapping("/base/appUser/queryById")
- public TAppUser queryById(@RequestBody Integer appUserId){
+ public TAppUser queryById(@RequestBody Integer appUserId) {
try {
return appUserService.getById(appUserId);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new TAppUser();
}
}
+
/**
* 根据名称模糊搜索用户
+ *
* @param name
* @return
*/
@ResponseBody
@PostMapping("/appUser/queryAppUserListByName")
- public List<TAppUser> queryAppUserListByName(@RequestBody String name){
+ public List<TAppUser> queryAppUserListByName(@RequestBody String name) {
return appUserService.list(new QueryWrapper<TAppUser>().eq("state", 1).like("name", name));
}
-
@PostMapping("/appUser/addCourseInfoRecord")
- public Boolean addCourseInfoRecord(@RequestBody TCourseInfoRecord tCourseInfoRecord){
+ public Boolean addCourseInfoRecord(@RequestBody TCourseInfoRecord tCourseInfoRecord) {
boolean save = courseInfoRecordService.save(tCourseInfoRecord);
return save;
}
@PostMapping("/appUser/getSelects")
- public List<SelectDto> getSelects(@RequestBody List<Integer> studentIds){
- List<SelectDto> selectDtos = appUserService.getSelects(studentIds);
- System.out.println("=======selectDtos======>"+selectDtos);
+ public List<SelectDto> getSelects(@RequestBody List<Integer> studentIds) {
+ List<SelectDto> selectDtos = appUserService.getSelects(studentIds);
+ System.out.println("=======selectDtos======>" + selectDtos);
return selectDtos;
}
- @PostMapping("/appUser/userInfo")
- public UserInfoQueryVO userInfo(@RequestBody UserInfoQueryDTO dto){
-
- UserInfoQueryVO userInfoQueryVO = new UserInfoQueryVO();
-
- LambdaQueryWrapper<TAppUser> wrapper = new LambdaQueryWrapper<>();
-
- if(StringUtils.hasLength(dto.getCityCode())){
- wrapper.eq(TAppUser::getCityCode,dto.getCityCode());
- }
-
- if(Objects.nonNull(dto.getOperatorId())){
- wrapper.eq(TAppUser::getInsertType,2);
- wrapper.eq(TAppUser::getAddUserId,dto.getOperatorId());
- }
-
- if(Objects.nonNull(dto.getStoreId())){
- wrapper.eq(TAppUser::getInsertType,3);
- wrapper.eq(TAppUser::getAddUserId,dto.getStoreId());
- }
-
- // 查询会员总数，年度会员总数
- int userCount = appUserService.count(wrapper);
- int userVipCount = appUserService.count(wrapper.eq(TAppUser::getIsVip,1));
-
- userInfoQueryVO.setUserCount(userCount);
- userInfoQueryVO.setUserVipCount(userVipCount);
-
- if(Objects.nonNull(dto.getIsVip())){
- wrapper.eq(TAppUser::getIsVip,dto.getIsVip());
- }
-
- // 年度数据
- List<YearData> yearData = appUserService.getYearUserCount(dto);
- userInfoQueryVO.setYearData(yearData);
- // 月度数据
- List<MonthData> monthData = appUserService.getMonthUserCount(dto);
- userInfoQueryVO.setMonthData(monthData);
-
- // 获取最近四周
- LocalDateTime minNow = LocalDateTime.now().with(LocalTime.MIN);
- LocalDateTime maxNow = LocalDateTime.now().with(LocalTime.MAX);
- // 周度数据
- dto.setStartTime(minNow.minusDays(6).toString());
- dto.setEndTime(maxNow.toString());
- WeekData week4 = appUserService.getWeekUserCount4(dto);
- dto.setStartTime(minNow.minusDays(13).toString());
- dto.setEndTime(maxNow.minusDays(6).toString());
- WeekData week3 = appUserService.getWeekUserCount3(dto);
- dto.setStartTime(minNow.minusDays(20).toString());
- dto.setEndTime(maxNow.minusDays(13).toString());
- WeekData week2 = appUserService.getWeekUserCount2(dto);
- dto.setStartTime(minNow.minusDays(27).toString());
- dto.setEndTime(maxNow.minusDays(20).toString());
- WeekData week1 = appUserService.getWeekUserCount1(dto);
-
- List<WeekData> weekDataList = new ArrayList<>();
- weekDataList.add(week1);
- weekDataList.add(week2);
- weekDataList.add(week3);
- weekDataList.add(week4);
- userInfoQueryVO.setWeekData(weekDataList);
-
- // 日度数据
- dto.setStartTime(minNow.minusDays(6).toString());
- dto.setEndTime(maxNow.toString());
- List<DayData> dayData = appUserService.getDayUserCount(dto);
- userInfoQueryVO.setDayData(dayData);
- return userInfoQueryVO;
+ @PostMapping("/appUser/queryAppUserByCityCode")
+ public List<TAppUser> queryAppUserByCityCode(@RequestBody String cityCode){
+ return appUserService.list(new QueryWrapper<TAppUser>()
+ .eq("state", 1)
+ .eq("cityCode", cityCode)
+ );
}
- @PostMapping("/appUser/ageInfo")
- public Map<String,Long> ageInfo(@RequestBody UserInfoQueryDTO dto){
- Map<String,Long> map = new HashMap<>();
- LambdaQueryWrapper<TAppUser> wrapper = new LambdaQueryWrapper<>();
-
- if(StringUtils.hasLength(dto.getCityCode())){
- wrapper.eq(TAppUser::getCityCode,dto.getCityCode());
- }
-
- if(Objects.nonNull(dto.getOperatorId())){
- wrapper.eq(TAppUser::getInsertType,2);
- wrapper.eq(TAppUser::getAddUserId,dto.getOperatorId());
- }
-
- if(Objects.nonNull(dto.getStoreId())){
- wrapper.eq(TAppUser::getInsertType,3);
- wrapper.eq(TAppUser::getAddUserId,dto.getStoreId());
- }
-
- List<TAppUser> list = appUserService.list(wrapper);
- // 查询会员
- list.forEach(tAppUser->tAppUser.setAge(DateUtil.ageOfNow(tAppUser.getBirthday())));
-
- map.put("age1", list.stream().filter(e -> e.getAge() > 0 && e.getAge() <= 12).count());
- map.put("age2",list.stream().filter(e -> e.getAge() >= 13 && e.getAge() <= 18).count());
- map.put("age3",list.stream().filter(e -> e.getAge() >= 19 && e.getAge() <= 25).count());
- map.put("age4",list.stream().filter(e -> e.getAge() >= 26 && e.getAge() <= 35).count());
- map.put("age5",list.stream().filter(e -> e.getAge() >= 36 && e.getAge() <= 50).count());
- map.put("age6",list.stream().filter(e -> e.getAge() >= 51).count());
- return map;
+ /**
+ * 根据城市code获取用户的id集合
+ * @param cityCode 城市code
+ * @return
+ */
+ @PostMapping("/appUser/getAppUserIds")
+ public List<Integer> getAppUserIds(@RequestBody String cityCode){
+ List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
+ return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
- @PostMapping("/appUser/sexInfo")
- public Map<String,Integer> sexInfo(@RequestBody UserInfoQueryDTO dto){
- Map<String,Integer> map = new HashMap<>(2);
- LambdaQueryWrapper<TAppUser> wrapper = new LambdaQueryWrapper<>();
-
- if(StringUtils.hasLength(dto.getCityCode())){
- wrapper.eq(TAppUser::getCityCode,dto.getCityCode());
+ /**
+ * 根据省市名称所有用户
+ * @param appUserIdsByCityName
+ * @return
+ */
+ @PostMapping("/appUser/getAppUserIdsByCityName")
+ public List<Integer> getAppUserIdsByCityName(@RequestBody AppUserIdsByCityName appUserIdsByCityName){
+ QueryWrapper<TAppUser> queryWrapper = new QueryWrapper<TAppUser>().eq("state", 1);
+ if(ToolUtil.isNotEmpty(appUserIdsByCityName.getProvince())){
+ queryWrapper.like("province", appUserIdsByCityName.getProvince());
}
-
- if(Objects.nonNull(dto.getOperatorId())){
- wrapper.eq(TAppUser::getInsertType,2);
- wrapper.eq(TAppUser::getAddUserId,dto.getOperatorId());
+ if(ToolUtil.isNotEmpty(appUserIdsByCityName.getCity())){
+ queryWrapper.like("city", appUserIdsByCityName.getCity());
}
-
- if(Objects.nonNull(dto.getStoreId())){
- wrapper.eq(TAppUser::getInsertType,3);
- wrapper.eq(TAppUser::getAddUserId,dto.getStoreId());
- }
-
- // 查询会员
- int boyCount = appUserService.count(wrapper.eq(TAppUser::getGender,1));
- int girlCount = appUserService.count(wrapper.eq(TAppUser::getGender,2));
- map.put("boyCount",boyCount);
- map.put("girlCount",girlCount);
- return map;
- }
-
- @PostMapping("/appUser/groupCityInfo")
- public List<GroupCityInfoVO> groupCityInfo(@RequestBody UserInfoQueryDTO dto){
- // 查询地区会员
- return appUserService.groupCityInfo(dto);
+ List<TAppUser> list = appUserService.list(queryWrapper);
+ return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
}
--
Gitblit v1.7.1