bug修改

无关风月

2024-07-02 8dd9a50bc350c2a4502093aa68baf326deebb67b

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -474,12 +474,14 @@
                    if (!rCode.equalsIgnoreCase(phoneCode)) {
                        return R.errorCode("登录失败，手机验证码无效!");
                    } else {
                        tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                        tUser1 = getUser(phone);
                        userService.save(tUser1);
                    }
                }
            } else {
                tUser1 = getUser(phone);
                tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                userService.save(tUser1);
            }
        }
@@ -550,6 +552,8 @@
            }
        } else {
            user = getUser(phone);
            user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");

            userService.save(user);
        }
        // 生成登录用户信息
@@ -809,7 +813,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];
@@ -1035,7 +1039,8 @@
        List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
                .eq(TStudy::getType, Constants.ONE)
                .orderByAsc(TStudy::getWeek).list();

        int size = studyService.residueWeek(studyRecord, studyList);
        studyRecord.setSurplus(size);
        res.setSurplus(studyRecord.getSurplus()+"");
        res.setTotalHours(studyRecord.getTotalStudy().doubleValue());
        res.setTodayHours(studyRecord.getTodayStudy().doubleValue());