From 0b24c13e3de201d5b2efbb086b3eedb29a5c6fbb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 03 七月 2024 18:25:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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 d91d2f2..e857fd7 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
@@ -28,6 +28,7 @@
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.*;
@@ -175,7 +176,7 @@
try {
System.err.println("进入支付宝回调");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
- System.err.println("返回参数");
+ System.err.println("返回参数"+map);
if (null != map) {
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
@@ -474,12 +475,18 @@
if (!rCode.equalsIgnoreCase(phoneCode)) {
return R.errorCode("登录失败，手机验证码无效!");
} else {
+ tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
tUser1 = getUser(phone);
+ tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
+ tUser1.setName("用户"+UUIDUtil.getNumberRandom(6));
userService.save(tUser1);
}
}
} else {
tUser1 = getUser(phone);
+ tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
+ tUser1.setAccount("用户"+UUIDUtil.getNumberRandom(6));
+ tUser1.setName("用户"+UUIDUtil.getNumberRandom(6));
userService.save(tUser1);
}
}
@@ -550,6 +557,9 @@
}
} else {
user = getUser(phone);
+ user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
+ user.setAccount("用户"+UUIDUtil.getNumberRandom(6));
+ user.setName("用户"+UUIDUtil.getNumberRandom(6));
userService.save(user);
}
// 生成登录用户信息
@@ -608,8 +618,25 @@
@ApiOperation(value = "发送手机验证码", tags = {"家长端/学习端-发送手机验证码"})
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
+ @ApiImplicitParam(value = "类型 更换手机号的时候传该参数 传1", name = "type", dataType = "int"),
})
- public R<?> sendPhoneCode(@RequestParam String phone) throws Exception {
+ public R<?> sendPhoneCode(String phone, Integer type) throws Exception {
+ if (type != null && type == 1){
+ List<TUser> list = userService.list(new QueryWrapper<TUser>()
+ .eq("phone", phone)
+ .ne("state", 3));
+ if (!list.isEmpty()) {
+ return R.fail("更换的手机号已被使用！");
+ }
+ LoginUserParent loginUser1 = tokenService.getLoginUser1();
+ if (loginUser1==null){
+ return R.tokenError("登录失效!");
+ }
+ TUser byId = userService.getById(loginUser1.getUserid());
+ if (byId.getPhone().equals(phone)){
+ return R.fail("更换的手机号不能和原手机号相同！");
+ }
+ }
return userService.phoneCode(phone) ? R.ok() : R.fail();
}
@@ -734,6 +761,18 @@
return R.tokenError("登录失效！");
}
TUser byId = userService.getById(loginUserStudy.getUserid());
+ // 判断用户会员到期时间 用于判断这个用户到底是不是会员
+ if (null != byId.getVipEndTime()) {
+ Date vipEndTime = byId.getVipEndTime();
+ Date now = new Date();
+ if (vipEndTime.before(now)) {
+ byId.setIsVip(Constants.ZERO);
+ } else {
+ byId.setIsVip(Constants.ONE);
+ }
+ }else{
+ byId.setIsVip(Constants.ZERO);
+ }
return R.ok(byId);
}
@@ -798,7 +837,7 @@
List<TUser> list = userService.list(new QueryWrapper<TUser>()
.eq("phone", phone)
.ne("state", 3));
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
return R.fail("更换的手机号已被使用！");
}
byId.setPhone(phone);
@@ -809,7 +848,7 @@
Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
if (null == redisPhoneCode) {
return R.errorCode("手机验证码无效");
- } else {
+ }else{
// redis 验证码的value 为 code:时间戳
String rCodeAndTime = String.valueOf(redisPhoneCode);
String rCode = rCodeAndTime.split(":")[0];
@@ -896,6 +935,7 @@
case 2:
// 支付宝退款
Map<String, String> stringStringMap1 = payMoneyUtil.aliRefund(transactionId, byId.getMoney().toString());
+ System.err.println("支付宝退款数据"+ stringStringMap1);
if (null == stringStringMap1) {
return R.fail("取消退款异常");
}
@@ -903,6 +943,7 @@
if (!"10000".equals(code)) {
return R.fail(stringStringMap1.get("return_msg"));
}
+ System.err.println("修改会员订单状态"+ byId);
byId.setPayState(3);
byId.setBackTime(new Date());
vipOrderService.updateById(byId);
@@ -910,7 +951,6 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.MONTH, -byId.getCount());
- Date dateAfterOneMonth = calendar.getTime();
Integer userId = byId.getUserId();
TUser byId1 = userService.getById(userId);
// 判断用户是不是第一次充值
@@ -920,11 +960,13 @@
.orderByDesc("createTime"));
int size = list.size();
if (size == 0) {
+ System.err.println("证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空");
// 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
byId1.setVipEndTime(null);
byId1.setVipPayTime(null);
userService.updateById(byId1);
} else {
+ System.err.println("最近的一次充值会员时间 将会员到期时间回退到上一次");
// 最近的一次充值会员时间
TVipOrder tVipOrder = list.get(0);
// 将会员到期时间回退到上一次
@@ -1022,14 +1064,16 @@
studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
// 总时长还需计算上游戏测试成绩时长
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, dto.getId())
- .eq(TGameRecord::getDisabled, 0).list();
+ .eq(TGameRecord::getDisabled, 0)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
for (TGameRecord tGameRecord : gameRecordList) {
tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
}
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
- studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
res.setCurrent(studyRecord.getWeek()+"");
// 剩余周目
List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
--
Gitblit v1.7.1