From dc5ee858231553ac54cde4427ef79d770f2c46fc Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 21 五月 2024 17:58:25 +0800
Subject: [PATCH] feat: 微信分享接口配置文件更改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 11 ++++++++---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 4 ++--
2 files changed, 10 insertions(+), 5 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..e56a842 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));
}
@@ -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));
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
index e0a84d7..14f88d5 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
@@ -53,13 +53,13 @@
/**
* 微信公众号的appid
*/
- @Value("appId")
+ @Value("wx.appId")
private String appId;
/**
* 微信公众号的appSecret
*/
- @Value("secret")
+ @Value("wx.secret")
private String secret;
@Override
--
Gitblit v1.7.1