From 2c875554fd972600307a98ed8583f20545a55b99 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 10:58:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 e4234ae..dc1d7d3 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
@@ -666,8 +666,13 @@
public AjaxResult<Map<String, Object>> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- List<TStudyListen> studyListens = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
- .eq(TStudyListen::getDay, day).eq(TStudyListen::getDisabled, 0).list();
+ LambdaQueryChainWrapper<TStudyListen> wrapper = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
+ .eq(TStudyListen::getDay, day).eq(TStudyListen::getDisabled, 0);
+ // 非会员只能查看非会员题目，会员可以查看所有题目
+ if (!isVip) {
+ wrapper.eq(TStudyListen::getIsVip, 0);
+ }
+ List<TStudyListen> studyListens = wrapper.list();
return AjaxResult.success(studyService.listenSelectPicture(week, day, studyListens));
}
@@ -938,7 +943,7 @@
* @param completeStudy 完成学习信息
*/
@PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习"})
+ @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
public AjaxResult<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
// 登录用户id
Integer userId = tokenService.getLoginUserStudy().getUserid();
@@ -950,7 +955,7 @@
TIntegralRecord integralRecord = new TIntegralRecord();
integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
integralRecord.setMethod(completeStudy.getMethod());
- integralRecord.setUserId(tokenService.getLoginUserStudy().getUserid());
+ integralRecord.setUserId(userId);
return AjaxResult.success(update && integralRecordService.save(integralRecord));
}
--
Gitblit v1.7.1