From 355038c6e60a7648091eb84564918ac2dafde116 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 01 七月 2024 09:19:01 +0800
Subject: [PATCH] fix: 学习端bug

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index e5bbfb6..8b804ff 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -738,6 +738,7 @@
             int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
             Integer totalStudy = studyRecord.getTotalStudy();
             studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+            studyRecord = studyService.studySchedule(studyRecord,week);
         }
         return R.ok(studyRecord);
     }
@@ -962,6 +963,31 @@
     }
 
     /**
+     * 退出游戏/故事学习
+     */
+    @GetMapping("/exitGameOrStory")
+    @ApiOperation(value = "退出游戏/故事学习", tags = {"学习端-题目"})
+    public R<Boolean> exitGameOrStory(@RequestParam Integer studyTime) {
+        LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+        if (null == loginStudy) {
+            return R.tokenError("登录失效!");
+        }
+        Integer userid = loginStudy.getUserid();
+        // 判断当前week和day是否已完成学习
+        TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+                .eq(TUserStudy::getDisabled, 0).one();
+        if (null == userStudy) {
+            userStudy = createUserStudy(userid);
+        }
+        // 学习时长更新
+        userStudy.setTotalStudy(userStudy.getTotalStudy() + studyTime);
+        userStudy.setTodayStudy(userStudy.getTodayStudy() + studyTime);
+        userStudy.setWeekStudy(userStudy.getWeekStudy() + studyTime);
+        userStudy.setMonthStudy(userStudy.getMonthStudy() + studyTime);
+        return R.ok(userStudyService.updateById(userStudy));
+    }
+
+    /**
      * 自主学习1-听音选图
      *
      * @param week 周目

--
Gitblit v1.7.1