From a3d6cf8f21a042365cdd4033f4bf8c097f34469e Mon Sep 17 00:00:00 2001 From: hjl <1657978663@qq.com> Date: 星期五, 19 七月 2024 16:29:18 +0800 Subject: [PATCH] fix: 学习端bug --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 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 ed73d4c..43042bf 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 @@ -95,37 +95,35 @@ 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); + } + if (userStudyRecord.getLook().equals(Constants.ONE_HUNDRED) && + userStudyRecord.getAnswer().equals(Constants.ONE_HUNDRED) && + userStudyRecord.getPair().equals(Constants.ONE_HUNDRED) && + userStudyRecord.getInduction().equals(Constants.ONE_HUNDRED) && + userStudyRecord.getListen().equals(Constants.ONE_HUNDRED)) { + // 学习完成,进入下一学习day Integer nextDay = DAY_MAP.get(String.valueOf(userStudyRecord.getDay())); - // type为5并且day为5应该进入游戏日 - if (Constants.FIVE.equals(completeStudy.getDay())) { - userStudyRecord.setPair(Constants.ONE_HUNDRED); + userStudyRecord.setDay(nextDay); + // 下一day为 6,进入游戏日 + if (nextDay.equals(Constants.SIX)) { // 游戏难度初始化 0(入门难度) userStudyRecord.setGameDifficulty(Constants.ZERO); } else { + // 重置学习进度 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); } - userStudyRecord.setDay(nextDay); } } // 更新学习时长 -- Gitblit v1.7.1