From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 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 607a5da..410d1af 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,17 +1,22 @@
package com.dsh.account.controller;
+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.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.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.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -27,6 +32,7 @@
import java.io.PrintWriter;
import java.util.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -59,6 +65,7 @@
public List<TAppUser> queryAppUserList(@RequestBody AppUserByNameAndPhoneDTO dto){
return appUserService.queryAPPUserByNameAndPhone(dto);
}
+
/**
* 根据用户姓名和电话模糊查询
*/
@@ -96,9 +103,13 @@
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);
}
@@ -106,10 +117,33 @@
/**
* 获取用户信息列表数据
*/
+ @ResponseBody
@RequestMapping("/base/appUser/listAll")
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;
}
/**
@@ -198,6 +232,19 @@
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();
+ }
+ }
@ResponseBody
@@ -213,6 +260,27 @@
return ResultUtil.runErr();
}
}
+
+
+
+ @ResponseBody
+ @PostMapping("/api/appUser/updateInfo")
+ @ApiOperation(value = "修改个人信息", tags = {"APP-登录注册"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil<String> updateInfo(UpdateInfoDto dto){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return appUserService.updateInfo(dto,uid);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
@@ -401,6 +469,8 @@
}
+ @Autowired
+ private UserIntegralChangesService userIntegralChangesService;
/**
* 修改用户信息
* @param appUser
@@ -410,6 +480,15 @@
public void updateAppUser(@RequestBody TAppUser appUser){
try {
appUserService.updateById(appUser);
+ 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();
}
--
Gitblit v1.7.1