From aa34f5b4a80eec408185cc36500149679e1a71c9 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 09:40:50 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java
index 24cfed5..eba7df6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java
@@ -93,38 +93,36 @@
// 学习记录
TUserStudy userStudyRecord = lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
- Integer type = completeStudy.getType();
- if (Constants.ONE.equals(type)) {
- userStudyRecord.setListen(Constants.ONE_HUNDRED);
- userStudyRecord.setLook(Constants.BURDEN_ONE);
- userStudyRecord.setInduction(Constants.BURDEN_ONE);
- userStudyRecord.setAnswer(Constants.BURDEN_ONE);
- userStudyRecord.setPair(Constants.BURDEN_ONE);
- } else if (Constants.TWO.equals(type)) {
- userStudyRecord.setLook(Constants.ONE_HUNDRED);
- userStudyRecord.setInduction(Constants.BURDEN_ONE);
- userStudyRecord.setAnswer(Constants.BURDEN_ONE);
- userStudyRecord.setPair(Constants.BURDEN_ONE);
- } else if (Constants.THREE.equals(type)) {
- userStudyRecord.setInduction(Constants.ONE_HUNDRED);
- userStudyRecord.setAnswer(Constants.BURDEN_ONE);
- userStudyRecord.setPair(Constants.BURDEN_ONE);
- } else if (Constants.FOUR.equals(type)) {
- userStudyRecord.setAnswer(Constants.ONE_HUNDRED);
- } else if (Constants.FIVE.equals(type)) {
- userStudyRecord.setPair(Constants.ONE_HUNDRED);
- // type为5并且day为5应该进入游戏日
- Integer nextDay = DAY_MAP.get(String.valueOf(userStudyRecord.getDay()));
- userStudyRecord.setDay(nextDay);
- // 游戏难度初始化 0(入门难度)
- userStudyRecord.setGameDifficulty(Constants.ZERO);
- // 学习day已切换更新学习进度及学习时长
-// userStudyRecord.setListen(Constants.BURDEN_ONE);
-// userStudyRecord.setLook(Constants.BURDEN_ONE);
-// userStudyRecord.setInduction(Constants.BURDEN_ONE);
-// userStudyRecord.setAnswer(Constants.BURDEN_ONE);
-// userStudyRecord.setPair(Constants.BURDEN_ONE);
- // 下一day为 1说明该周目已完成，应更改为下一周目
+ Integer week = userStudyRecord.getWeek();
+ Integer day = userStudyRecord.getDay();
+ if (week.equals(completeStudy.getWeek()) && day.equals(completeStudy.getDay())) {
+ Integer type = completeStudy.getType();
+ if (Constants.ONE.equals(type)) {
+ userStudyRecord.setListen(Constants.ONE_HUNDRED);
+ userStudyRecord.setLook(Constants.BURDEN_ONE);
+ userStudyRecord.setInduction(Constants.BURDEN_ONE);
+ userStudyRecord.setAnswer(Constants.BURDEN_ONE);
+ userStudyRecord.setPair(Constants.BURDEN_ONE);
+ } else if (Constants.TWO.equals(type)) {
+ userStudyRecord.setLook(Constants.ONE_HUNDRED);
+ userStudyRecord.setInduction(Constants.BURDEN_ONE);
+ userStudyRecord.setAnswer(Constants.BURDEN_ONE);
+ userStudyRecord.setPair(Constants.BURDEN_ONE);
+ } else if (Constants.THREE.equals(type)) {
+ userStudyRecord.setInduction(Constants.ONE_HUNDRED);
+ userStudyRecord.setAnswer(Constants.BURDEN_ONE);
+ userStudyRecord.setPair(Constants.BURDEN_ONE);
+ } else if (Constants.FOUR.equals(type)) {
+ userStudyRecord.setAnswer(Constants.ONE_HUNDRED);
+ userStudyRecord.setPair(Constants.BURDEN_ONE);
+ } else if (Constants.FIVE.equals(type)) {
+ userStudyRecord.setPair(Constants.ONE_HUNDRED);
+ // type为5并且day为5应该进入游戏日
+ Integer nextDay = DAY_MAP.get(String.valueOf(userStudyRecord.getDay()));
+ userStudyRecord.setDay(nextDay);
+ // 游戏难度初始化 0(入门难度)
+ userStudyRecord.setGameDifficulty(Constants.ZERO);
+ }
}
// 更新学习时长
userStudyRecord.setTotalStudy(userStudyRecord.getTotalStudy() + studyTime);
--
Gitblit v1.7.1