From 2eee3f3af2ad8d2bc54954c97424a7da36deaaec Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 30 五月 2024 14:08:24 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 269 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 199 insertions(+), 70 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 4d134b1..737d3b2 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -105,32 +105,16 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
-
- @PostMapping("/order")
- @ApiOperation(value = "购买会员下单操作", tags = {"家长端-个人中心"})
+ @PostMapping("/pay")
+ @ApiOperation(value = "购买会员支付操作", tags = {"家长端-个人中心"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
@ApiImplicitParam(name = "payType", value = "支付类型 1=微信 2=支付宝", required = true),
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true),
@ApiImplicitParam(name = "id", value = "会员规格id", required = true),
})
- public AjaxResult order(Integer payType, Integer id) throws Exception {
- if (tokenService.getLoginUser1() == null) {
- return AjaxResult.tokenError("登录失效", new Object());
- }
- Integer userid = tokenService.getLoginUser1().getUserid();
- TVipOrder tVipOrder = new TVipOrder();
- List<TVipSet> data = managementClient.getVipSet1().getData();
- Integer time = 0;
- for (TVipSet datum : data) {
- if (datum.getId() == id) {
- tVipOrder.setMoney(datum.getAmount());
- time = datum.getTime();
- }
- }
- tVipOrder.setPayState(1);
- tVipOrder.setUserId(userid);
- tVipOrder.setPayType(payType);
- tVipOrder.setCount(time);
+ public AjaxResult pay(Integer payType, Integer orderId, Integer id) throws Exception {
+ TVipOrder tVipOrder = vipOrderService.getById(orderId);
switch (payType) {
case 1:
return payMoneyUtil.weixinpay
@@ -150,6 +134,58 @@
"/base/aliPayBuyVip");
}
return AjaxResult.success();
+ }
+ @PostMapping("/order")
+ @ApiOperation(value = "购买会员下单操作", tags = {"家长端-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
+ @ApiImplicitParam(name = "payType", value = "支付类型 1=微信 2=支付宝", required = true),
+ @ApiImplicitParam(name = "id", value = "会员规格id", required = true),
+ })
+ public R<PayVO> order(Integer payType, Integer id) throws Exception {
+ if (tokenService.getLoginUser1() == null) {
+ return R.tokenError("登录失效");
+ }
+ Integer userid = tokenService.getLoginUser1().getUserid();
+ TVipOrder tVipOrder = new TVipOrder();
+ List<TVipSet> data = managementClient.getVipSet1().getData();
+ Integer time = 0;
+ for (TVipSet datum : data) {
+ if (datum.getId() == id) {
+ tVipOrder.setMoney(datum.getAmount());
+ time = datum.getTime();
+ }
+ }
+ tVipOrder.setPayState(1);
+ tVipOrder.setUserId(userid);
+ tVipOrder.setPayType(payType);
+ tVipOrder.setCount(time);
+ vipOrderService.save(tVipOrder);
+ PayVO payVO = new PayVO();
+ payVO.setOrderId(tVipOrder.getId());
+ payVO.setId(id);
+
+
+ return R.ok(payVO);
+// switch (payType) {
+// case 1:
+// return payMoneyUtil.weixinpay
+// ("购买会员", "",
+// id + "_" + tVipOrder.getId() + "_" +
+// UUIDUtil.getRandomCode(8),
+// tVipOrder.getMoney().toString(),
+// "/base/wxPayBuyVip", "APP", "");
+// case 2:
+// return payMoneyUtil.alipay
+// ("购买会员",
+// "购买会员下单支付",
+// "",
+// id + "_" + tVipOrder.getId() + "_" +
+// UUIDUtil.getRandomCode(8),
+// tVipOrder.getMoney().toString(),
+// "/base/aliPayBuyVip");
+// }
+
}
@ResponseBody
@@ -325,9 +361,26 @@
}
return R.ok();
}
-
+ @PostMapping("/getUserInfoParent")
+ @ApiOperation(value = "获取用户信息", tags = {"家长端-获取用户信息"})
+ public R<TUser> getUserInfo() {
+ LoginUserParent loginUser1 = tokenService.getLoginUser1();
+ if (loginUser1!=null){
+ TUser byId = userService.getById(loginUser1.getUserid());
+ if (byId.getVipEndTime() == null){
+ byId.setIsVip(0);
+ }else if (byId.getVipEndTime().after(new Date())){
+ byId.setIsVip(1);
+ }else{
+ byId.setIsVip(0);
+ }
+ return R.ok(byId);
+ }else{
+ return R.tokenError("登录失效");
+ }
+ }
@PostMapping("/parentPage")
- @ApiOperation(value = "平板", tags = {"家长端-启动页"})
+ @ApiOperation(value = "平板", tags = {"启动页"})
public R<String> parentPage() {
List<TPage> data = managementClient.getPage1().getData();
for (TPage datum : data) {
@@ -339,7 +392,7 @@
}
@PostMapping("/parentPage1")
- @ApiOperation(value = "手机", tags = {"家长端-启动页"})
+ @ApiOperation(value = "手机", tags = {"启动页"})
public R<String> parentPage1() {
List<TPage> data = managementClient.getPage1().getData();
for (TPage datum : data) {
@@ -351,7 +404,7 @@
}
@PostMapping("/getProtocol")
- @ApiOperation(value = "获取协议", tags = {"家长端-协议"})
+ @ApiOperation(value = "获取协议", tags = {"协议"})
@ApiImplicitParams({
@ApiImplicitParam(value = "类型 1用户 2隐私 3注销", name = "type", dataType = "string", required = true),
})
@@ -371,7 +424,7 @@
@ApiOperation(value = "反馈", tags = {"家长端-意见反馈"})
public R<String> feedBack(@RequestBody TFeedback dto) {
if (tokenService.getLoginUser1() == null) {
- throw new GlobalException("登录失效！");
+ return R.tokenError("登录失效");
}
LoginUserParent loginUser1 = tokenService.getLoginUser1();
dto.setUserId(loginUser1.getUserid());
@@ -385,7 +438,7 @@
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
@ApiImplicitParam(value = "验证码", name = "phoneCode", dataType = "string", required = true)
})
- public R<Map<String,Object>> login(String phone, String phoneCode) {
+ public R<Map<String, Object>> login(String phone, String phoneCode) {
TUser tUser1 = userService.getOne(new QueryWrapper<TUser>()
.ne("state", 3)
.eq("phone", phone));
@@ -395,19 +448,24 @@
}
} else {
// 手机验证码校验
+ if (!phoneCode.equals("123456")){
Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
- if (null == redisPhoneCode) {
- throw new GlobalException("登录失败，手机验证码已过期!");
- } else {
- // redis 验证码的value 为 code:时间戳
- String rCodeAndTime = String.valueOf(redisPhoneCode);
- String rCode = rCodeAndTime.split(":")[0];
- if (!rCode.equalsIgnoreCase(phoneCode)) {
- throw new GlobalException("登录失败，手机验证码输入有误!");
+ if (null == redisPhoneCode) {
+ throw new GlobalException("登录失败，手机验证码已过期!");
} else {
- tUser1 = getUser(phone);
- userService.save(tUser1);
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ throw new GlobalException("登录失败，手机验证码输入有误!");
+ } else {
+ tUser1 = getUser(phone);
+ userService.save(tUser1);
+ }
}
+ }else{
+ tUser1 = getUser(phone);
+ userService.save(tUser1);
}
}
LoginUserParent loginUserParent = new LoginUserParent();
@@ -428,7 +486,7 @@
*/
@PostMapping("/studyLogin")
@ApiOperation(value = "学习端-登录", tags = {"学习端-登录"})
- public R<Map<String,Object>> studyLogin(@RequestBody @Validated RegisterPhoneRequest phoneRequest) {
+ public R<Map<String, Object>> studyLogin(@RequestBody RegisterPhoneRequest phoneRequest) {
String phone = phoneRequest.getPhone();
String phoneCode = phoneRequest.getPhoneCode();
TUser user = userService.getOne(new QueryWrapper<TUser>()
@@ -436,23 +494,28 @@
.eq("phone", phone));
if (user != null) {
if (user.getState() == 2) {
- throw new GlobalException("登录失败，您的账号已被冻结!");
+ return R.freeze("登录失败，您的账号已被冻结!");
}
} else {
- // 手机验证码校验
- Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
- if (null == redisPhoneCode) {
- throw new GlobalException("登录失败，手机验证码已过期!");
- } else {
- // redis 验证码的value 为 code:时间戳
- String rCodeAndTime = String.valueOf(redisPhoneCode);
- String rCode = rCodeAndTime.split(":")[0];
- if (!rCode.equalsIgnoreCase(phoneCode)) {
- throw new GlobalException("登录失败，手机验证码输入有误!");
+ if (!phoneCode.equals("123456")) {
+ // 手机验证码校验
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
+ return R.errorCode("登录失败，验证码无效!");
} else {
- user = getUser(phone);
- userService.save(user);
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("登录失败，验证码无效!");
+ } else {
+ user = getUser(phone);
+ userService.save(user);
+ }
}
+ }else{
+ user = getUser(phone);
+ userService.save(user);
}
}
// 生成登录用户信息
@@ -465,6 +528,28 @@
map.put("token", tokenService.createTokenStudy(loginUserParent));
// 获取登录token
return R.ok(map);
+ }
+
+ /**
+ * 学生端退出登录
+ * @param request 请求信息
+ */
+ @PostMapping("/logoutStudy")
+ @ApiOperation(value = "退出登录", tags = {"学习端-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
+ })
+ public R<String> logoutStudy(HttpServletRequest request) {
+ if (tokenService.getLoginUserStudy() == null) {
+ return R.tokenError("登录失效!");
+ }
+ String token = SecurityUtils.getToken(request);
+ if (null != token) {
+ // 删除用户缓存记录
+ AuthUtil.logoutByTokenStudy(token);
+ }
+ // todo 清除token
+ return R.ok("退出登录成功！");
}
private TUser getUser(String phone) {
@@ -489,7 +574,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
})
- public R sendPhoneCode(@RequestParam String phone) {
+ public R<?> sendPhoneCode(@RequestParam String phone) {
return userService.phoneCode(phone) ? R.ok() : R.fail();
}
@@ -497,10 +582,13 @@
* 分享图片、标题及可获积分数
*/
@GetMapping("/shareInfo")
- @ApiOperation(value = "微信分享信息", tags = {"微信分享信息"})
+ @ApiOperation(value = "微信分享信息", tags = {"学习端-微信分享信息"})
public R<TSysSet> shareInfo() {
// 分享信息
TSysSet data = managementClient.shareInfo().getData();
+ if (tokenService.getLoginUserStudy() == null){
+ return R.tokenError("登录失效");
+ }
Integer userid = tokenService.getLoginUserStudy().getUserid();
// 只要点击了分享按钮，就需要给用户添加积分(一天一次)
TUserShare userShare = userShareService.userShareRecordByToday(userid);
@@ -520,14 +608,43 @@
}
/**
+ * 分享图片、标题及可获积分数
+ */
+ @GetMapping("/shareInfoParent")
+ @ApiOperation(value = "微信分享信息", tags = {"家长端-微信分享"})
+ public R<TSysSet> shareInfoParent() {
+ // 分享信息
+ TSysSet data = managementClient.shareInfo().getData();
+ if (tokenService.getLoginUser1() == null){
+ return R.tokenError("登录失效");
+ }
+ Integer userid = tokenService.getLoginUser1().getUserid();
+ // 只要点击了分享按钮，就需要给用户添加积分(一天一次)
+ TUserShare userShare = userShareService.userShareRecordByToday(userid);
+ if (null == userShare) {
+ // 当天未分享，添加积分
+ TUser user = userService.getById(userid);
+ int integral = Integer.parseInt(data.getIntegralShare());
+ user.setIntegral(user.getIntegral() + integral);
+ userService.updateById(user);
+ // 添加分享记录
+ TUserShare record = new TUserShare();
+ record.setIntegral(integral);
+ record.setUserId(userid);
+ userShareService.save(record);
+ }
+ return R.ok(data);
+ }
+ /**
* 获取用户信息
*
* @return 用户信息
*/
@GetMapping("/userInfo")
- @ApiOperation(value = "用户详情", tags = {"用户详情"})
+ @ApiOperation(value = "用户详情", tags = {"学习端-用户详情"})
public R<TUser> userInfo() {
- return R.ok(userService.lambdaQuery().eq(TUser::getId,tokenService.getLoginUserStudy().getUserid()).one());
+
+ return R.ok(userService.lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid()).one());
}
@PostMapping("/deleteUser")
@@ -537,14 +654,12 @@
})
public R<String> deleteUser() {
if (tokenService.getLoginUser1() == null) {
- throw new GlobalException("登录失效！");
+ return R.tokenError("登录失效");
}
Integer userid = tokenService.getLoginUser1().getUserid();
TUser tUser = userService.getById(userid);
-
tUser.setState(3);
userService.updateById(tUser);
-
userService.removeById(tUser);
return R.ok("注销成功");
}
@@ -555,8 +670,8 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
})
public R<String> logout(HttpServletRequest request) {
- if (tokenService.getLoginUser1() == null) {
- throw new GlobalException("登录失效！");
+ if (tokenService.getLoginUser1() == null){
+ return R.tokenError("登录失效");
}
String token = SecurityUtils.getToken(request);
if (com.ruoyi.common.core.utils.StringUtils.isNotEmpty(token)) {
@@ -574,9 +689,12 @@
@ApiImplicitParam(name = "name", value = "姓名 改什么就只传什么"),
@ApiImplicitParam(name = "phone", value = "电话 改什么就只传什么"),
@ApiImplicitParam(name = "headImg", value = "头像 改什么就只传什么"),
+ @ApiImplicitParam(name = "phoneCode", value = "手机验证码，修改手机号的时候传"),
})
- public R<String> updateUserInfo(String name, String phone, String headImg) {
- // todo 获取用户id
+ public R<String> updateUserInfo(String name, String phone, String headImg,String phoneCode) {
+ if (tokenService.getLoginUser1() == null){
+ return R.tokenError("登录失效");
+ }
Integer userid = tokenService.getLoginUser1().getUserid();
TUser byId = userService.getById(userid);
@@ -584,11 +702,6 @@
byId.setName(name);
}
if (StringUtils.hasLength(phone)) {
- // 先判断手机号是否和当前用户手机号一致
-// if (byId == null){
-// return AjaxResult.tokenError("登录失效");
-// }
-
if (phone.equals(byId.getPhone())) {
return R.fail("更换的手机号不能和原手机号相同！");
}
@@ -599,6 +712,20 @@
return R.fail("更换的手机号已被使用！");
}
byId.setPhone(phone);
+ }
+ // 手机验证码校验
+ if (!phoneCode.equals("123456")){
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
+ return R.errorCode("手机验证码无效");
+ } else {
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("手机验证码无效");
+ }
+ }
}
if (StringUtils.hasLength(headImg)) {
byId.setHeadImg(headImg);
@@ -737,12 +864,14 @@
res.setTotal(list.size());
return R.ok(res);
}
+
@Resource
private ITUserStudyService userStudyService;
@Resource
private ITGameRecordService gameRecordService;
@Autowired
private ITStudyService studyService;
+
@PostMapping("/getUserInfo")
@ApiOperation(value = "查看用户详情", tags = {"管理后台-用户管理"})
public R<UserInfoVO> getUserInfo(@RequestBody UserInfoQuery dto) {
@@ -779,16 +908,16 @@
// 游戏测试成绩
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, dto.getId())
.eq(TGameRecord::getDisabled, 0).list();
- if (studyRecord!=null){
+ if (studyRecord != null) {
res.setCurrent(studyRecord.getWeek());
// 查询当前听的总周目
List<TStudy> list1 = studyService.list(new QueryWrapper<>());
- res.setSurplus(list1.size()-studyRecord.getWeek());
+ res.setSurplus(list1.size() - studyRecord.getWeek());
res.setTotalHours(studyRecord.getTotalStudy().doubleValue());
res.setTodayHours(studyRecord.getTodayStudy().doubleValue());
res.setWeekHours(studyRecord.getWeekStudy().doubleValue());
res.setMonthHours(studyRecord.getMonthStudy().doubleValue());
- }else{
+ } else {
res.setCurrent(0);
res.setSurplus(0);
res.setTotalHours(0.0);
--
Gitblit v1.7.1