From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 325 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 300 insertions(+), 25 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 7f75133..a0d433c 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,12 +1,17 @@
package com.dsh.account.controller;
-import com.dsh.account.entity.TAppUser;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.TAppUserService;
+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.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.*;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -14,13 +19,16 @@
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.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.util.Map;
+import java.util.*;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -42,9 +50,129 @@
@Autowired
private TokenUtil tokenUtil;
+ @Autowired
+ private TCourseInfoRecordService courseInfoRecordService;
+ @Autowired
+ 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){
+ return appUserService.queryAPPUserByNameAndPhone(dto);
+ }
+ /**
+ * 根据用户姓名和电话模糊查询
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/queryAPPUserByNameAndPhone")
+ 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;
+ }
+ /**
+ * 冻结/解冻 1=解冻 2=冻结
+ */
+ @RequestMapping("/base/appUser/changeState")
+ public Object changeState(@RequestBody AdvertisementChangeStateDTO dto){
+ return appUserService.changeState(dto);
+ }
+ /**
+ * 后台添加
+ */
+ @RequestMapping("/base/appUser/addAppUser1")
+ 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){
+ return 5001;
+ }
+ }else {
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()));
+ if (null != phone){
+ return 5001;
+ }
+ }
+ query.setIsVip(0);
+ query.setInsertTime(new Date());
+ return appUserService.saveOrUpdate(query);
+ }
+ /**
+ * 获取用户信息列表数据
+ */
+ @ResponseBody
+ @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);
+ }
+ 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;
+ }
+
+ /**
+ * 根据用户手机号获取用户id
+ */
+ @ResponseBody
+ @GetMapping("/base/appUser/getAppUserByPhone/{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-登录注册"})
@@ -52,7 +180,7 @@
@ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true)
})
- public ResultUtil getSMSCode(@RequestBody Integer type, @RequestBody String phone){
+ public ResultUtil getSMSCode(Integer type, String phone){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -69,12 +197,34 @@
}
+ @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-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil addAppUser(@RequestBody AddAppUserVo addAppUserVo){
+ public ResultUtil addAppUser(AddAppUserVo addAppUserVo){
try {
return appUserService.addAppUser(addAppUserVo);
}catch (Exception e){
@@ -91,7 +241,7 @@
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true),
@ApiImplicitParam(value = "登录密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil<String> loginPassword(@RequestBody String phone, @RequestBody String password){
+ public ResultUtil<String> loginPassword(String phone, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -113,9 +263,22 @@
@ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginSMSCode(@RequestBody LoginSMSCodeVo loginSMSCodeVo){
+ public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo){
try {
return appUserService.loginSMSCode(loginSMSCodeVo);
+ }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();
@@ -128,7 +291,7 @@
@ApiOperation(value = "微信登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginWeChat(@RequestBody LoginWeChatVo loginWeChatVo){
+ public ResultUtil<String> loginWeChat(LoginWeChatVo loginWeChatVo){
try {
return appUserService.loginWechat(loginWeChatVo);
}catch (Exception e){
@@ -140,6 +303,29 @@
@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();
+ }
+ }
+
+
+
+
+
+
+ @ResponseBody
@PostMapping("/base/appUser/updatePassword")
@ApiOperation(value = "修改密码", tags = {"APP-登录注册"})
@ApiImplicitParams({
@@ -147,7 +333,7 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil updatePassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){
+ public ResultUtil updatePassword(String phone, String code, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -174,7 +360,7 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil forgetPassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){
+ public ResultUtil forgetPassword(String phone, String code, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -198,17 +384,12 @@
@PostMapping("/api/appUser/queryJoinPlayPai")
@ApiOperation(value = "获取加入玩湃首页数据", tags = {"APP-加入玩湃"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @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(@RequestBody String lon, @RequestBody String lat){
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat");
- }
+ public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
+
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -233,7 +414,7 @@
@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(@RequestBody Integer payType){
+ public ResultUtil addVipPayment(Integer payType){
if(ToolUtil.isEmpty(payType)){
return ResultUtil.paranErr("payType");
}
@@ -291,6 +472,7 @@
@PostMapping("/base/appUser/addVipPaymentAliCallback")
public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.err.println("==============购买优惠卷回调=========");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String out_trade_no = map.get("out_trade_no");
@@ -325,4 +507,97 @@
return null;
}
}
+
+
+ @Autowired
+ private UserIntegralChangesService userIntegralChangesService;
+ /**
+ * 修改用户信息
+ * @param appUser
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/updateAppUser")
+ 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();
+ }
+ }
+
+
+ @PostMapping("/base/appUser/getAllUser")
+ @ResponseBody
+ public List<TAppUser> getAllUser(){
+ try {
+ return appUserService.list();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+ @PostMapping("/base/appUser/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.getPhone())){
+ tAppUserLambdaQueryWrapper.like(TAppUser::getPhone,queryByNamePhone.getPhone());
+ }
+ List<TAppUser> list = appUserService.list(tAppUserLambdaQueryWrapper);
+ return list;
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+ @PostMapping("/base/appUser/queryById")
+ public TAppUser queryById(@RequestBody Integer appUserId){
+ try {
+ return appUserService.getById(appUserId);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new TAppUser();
+ }
+ }
+
+
+ /**
+ * 根据名称模糊搜索用户
+ * @param name
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/appUser/queryAppUserListByName")
+ 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){
+ 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);
+ return selectDtos;
+ }
}
--
Gitblit v1.7.1