From 82d0f09da0e5f58b3bbaeafdd3d4bf00cbde73d7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 五月 2024 09:04:37 +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/dto/CompleteStudyDTO.java | 6 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java | 10 +-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TGameServiceImpl.java | 23 ++++
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/config/MybatisPlusConfig.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 125 +++++++++++++++++-------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java | 5
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java | 16 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java | 12 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java | 12 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java | 10 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITGameService.java | 14 ++
12 files changed, 183 insertions(+), 58 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/config/MybatisPlusConfig.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/config/MybatisPlusConfig.java
index 0a4ca4e..5254575 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/config/MybatisPlusConfig.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/config/MybatisPlusConfig.java
@@ -18,10 +18,10 @@
*/
@Configuration
public class MybatisPlusConfig {
- private final DataUpdateHandlerConfig dataUpdateHandler;
+ private final com.ruoyi.system.api.config.DataUpdateHandlerConfig dataUpdateHandler;
@Autowired
- public MybatisPlusConfig(DataUpdateHandlerConfig dataUpdateHandler) {
+ public MybatisPlusConfig(com.ruoyi.system.api.config.DataUpdateHandlerConfig dataUpdateHandler) {
this.dataUpdateHandler = dataUpdateHandler;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
index 5bd88f5..6e003ba 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.LoginUserParent;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,7 @@
public void insertFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- if (loginUser!=null){
+ if (loginUser != null) {
String userName = loginUser.getUsername();
if (StringUtils.hasLength(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
@@ -51,6 +50,11 @@
this.setFieldValByName("createTime", "", metaObject);
this.setFieldValByName("updateTime", "", metaObject);
}
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
}
}
@@ -64,7 +68,7 @@
public void updateFill(MetaObject metaObject) {
// 获取登录信息
LoginUser loginUser = tokenService.getLoginUser();
- if (loginUser !=null){
+ if (loginUser != null) {
String userName = loginUser.getUsername();
if (StringUtils.hasLength(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
@@ -77,7 +81,11 @@
this.setFieldValByName("createTime", "", metaObject);
this.setFieldValByName("updateTime", "", metaObject);
}
+ } else {
+ this.setFieldValByName("createBy", "", metaObject);
+ this.setFieldValByName("updateBy", "", metaObject);
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
}
-
}
}
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 9ec5522..98d2a9c 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
@@ -76,6 +76,8 @@
private ITUserService userService;
@Resource
private TokenService tokenService;
+ @Resource
+ private ITSubjectRecordService subjectRecordService;
@PostMapping("/storyList")
@ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -429,7 +431,7 @@
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
.eq("week", dto.getWeek()));
- if (!list8.isEmpty()){
+ if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
}
@@ -693,13 +695,31 @@
}
/**
+ * 进入题组后，获取题组学习进度信息
+ *
+ * @param week 周目
+ * @param day 所属day
+ */
+ @GetMapping("/teamSchedule")
+ @ApiOperation(value = "获取题组学习进度信息", tags = {"获取题组学习进度信息"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public R<TSubjectRecord> teamSchedule(@RequestParam Integer week, @RequestParam Integer day) {
+ TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery().eq(TSubjectRecord::getWeek, week).eq(TSubjectRecord::getDay, day)
+ .eq(TSubjectRecord::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(TSubjectRecord::getDisabled, 0).one();
+ return R.ok(subjectRecord);
+ }
+
+ /**
* 退出学习，记录学习进度、当日学习时长...
*/
@PostMapping("/exitLearning")
@ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"退出学习(记录学习进度等信息)"})
- public R<Boolean> exitLearning(@RequestBody TUserStudy userStudy) {
+ public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
// 学习时长处理
- return R.ok(userStudyService.updateById(userStudy));
+ return R.ok(subjectRecordService.updateById(subjectRecord));
}
/**
@@ -829,6 +849,31 @@
}
/**
+ * 学习完成，生成学习记录，积分明细记录
+ *
+ * @param completeStudy 完成学习信息
+ */
+ @PostMapping("/completeLearning")
+ @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
+ public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ // 登录用户id
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
+ // 获取user详细信息，改变积分
+ boolean update = true;
+ if (completeStudy.getIsComplete()) {
+ TUser user = userService.getById(userId);
+ user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
+ update = userService.updateById(user);
+ }
+ // 生成积分明细记录
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
+ integralRecord.setMethod(completeStudy.getMethod());
+ integralRecord.setUserId(userId);
+ return R.ok(update && integralRecordService.save(integralRecord));
+ }
+
+ /**
* 自主游戏1-超级听力
*
* @param difficulty 难度(0入门、1中级、2困难)
@@ -914,12 +959,27 @@
@PostMapping("/gameAchievement")
@ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"完成游戏-记录游戏测试成绩"})
public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ /*
+ * 游戏测试需要根据正确率计算本次测试可获得积分
+ * 并且需要判断如果该游戏用户已获取一部分积分，再次测试后正确率增长，只能获取高于上次正确率的部分积分
+ * 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
+ */
+ Integer userid = tokenService.getLoginUserStudy().getUserid();
TGame game = gameService.getById(completeStudy.getGameId());
+ // 积分明细
+ List<TIntegralRecord> integralRecordList = integralRecordService.lambdaQuery().eq(TIntegralRecord::getUserId, userid)
+ .eq(TIntegralRecord::getGameId, game.getId()).eq(TIntegralRecord::getDisabled, 0).list();
+ Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, integralRecordList);
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
- // 添加积分明细记录
- add = add && integralRecordService.add(game.getIntegral(), completeStudy.getMethod());
- // 用户账户添加积分
+ // 可获得积分不为null时，才添加积分明细记录
+ if (null != availableIntegral) {
+ add = add && integralRecordService.add(String.valueOf(availableIntegral), completeStudy.getMethod(), completeStudy.getGameId(), null);
+ // 用户账户添加积分
+ TUser user = userService.getById(userid);
+ user.setIntegral(user.getIntegral() + availableIntegral);
+ add = add && userService.updateById(user);
+ }
return R.ok(add);
}
@@ -987,28 +1047,6 @@
}
/**
- * 学习完成，生成学习记录，积分明细记录
- *
- * @param completeStudy 完成学习信息
- */
- @PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
- public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
- // 登录用户id
- Integer userId = tokenService.getLoginUserStudy().getUserid();
- // 获取user详细信息，改变积分
- TUser user = userService.getById(userId);
- user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
- boolean update = userService.updateById(user);
- // 生成积分明细记录
- TIntegralRecord integralRecord = new TIntegralRecord();
- integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
- integralRecord.setMethod(completeStudy.getMethod());
- integralRecord.setUserId(userId);
- return R.ok(update && integralRecordService.save(integralRecord));
- }
-
- /**
* 完成故事类型
*/
@GetMapping("/completeStory")
@@ -1019,15 +1057,26 @@
@ApiImplicitParam(value = "完成答题/完成听故事", name = "method", dataType = "String", required = true)
})
public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
- @RequestParam String method) {
- // 添加积分明细记录
- Boolean add = integralRecordService.add(String.valueOf(integral), method);
+ @RequestParam String method) {
+ TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId).eq(TStoryListen::getDisabled, 0).one();
+ if (null == storyListen) {
+ throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
+ }
// 用户信息
Integer userId = tokenService.getLoginUserStudy().getUserid();
- TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
- // 返回结果
- user.setIntegral(user.getIntegral() + integral);
- return R.ok(add && userService.updateById(user));
+ // 故事只有首次才能获取积分
+ TIntegralRecord integralRecord = integralRecordService.lambdaQuery().eq(TIntegralRecord::getUserId, userId)
+ .eq(TIntegralRecord::getStoryId, storyId).eq(TIntegralRecord::getDisabled, 0).one();
+ Boolean result = true;
+ if (null == integralRecord) {
+ // 添加积分明细记录
+ result = integralRecordService.add(String.valueOf(integral), method, null, storyId);
+ TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
+ // 添加积分
+ user.setIntegral(user.getIntegral() + integral);
+ result = result && userService.updateById(user);
+ }
+ return R.ok(result);
}
@GetMapping("/studyRecord")
@@ -1040,7 +1089,7 @@
// 游戏测试成绩
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
.eq(TGameRecord::getDisabled, 0).list();
- return R.ok(new StudyRecordResultVO(studyRecord,gameRecordList));
+ return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
}
@GetMapping("/integralDetail")
@@ -1051,8 +1100,8 @@
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<IPage<TIntegralRecord>> integralDetail(String time,
- @RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize) {
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUserStudy().getUserid(), time));
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
index c5ee46b..b593a17 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
@@ -43,6 +43,18 @@
private Integer userId;
/**
+ * 游戏id
+ */
+ @ApiModelProperty("游戏id 对应t_game")
+ private Integer gameId;
+
+ /**
+ * 故事id
+ */
+ @ApiModelProperty("故事id 对应t_story_listen")
+ private Integer storyId;
+
+ /**
* 前端用，返回积分变动类型
*
* @return 变动类型中文字符串
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
index aabba04..26dc0db 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
@@ -30,20 +30,24 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
- private Integer userId;/**
+ private Integer userId;
/**
+ * /**
* 所属周目
*/
@ApiModelProperty(value = "所属周目")
- private Integer week;/**
+ private Integer week;
+ /**
* 学习进度dayXX
*/
@ApiModelProperty(value = "学习进度dayXX ")
- private Integer day;/**
+ private Integer day;
+ /**
* 上次回答到的题组id
*/
@ApiModelProperty(value = "上次回答到的题组id")
- private Integer beforeSubject;/**
+ private Integer beforeSubject;
+ /**
* 类型1听音选图2看图选音3归纳排除4有问有答5音图相配
*/
@ApiModelProperty(value = "类型1听音选图2看图选音3归纳排除4有问有答5音图相配")
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
index 509d55d..7a30ca3 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
@@ -59,27 +59,27 @@
/**
* 故事名称
*/
- @ApiModelProperty(value = "听音选图学习进度")
+ @ApiModelProperty(value = "听音选图学习进度(100为已完成)")
private Integer listen;
/**
* 故事名称
*/
- @ApiModelProperty(value = "看图选音学习进度")
+ @ApiModelProperty(value = "看图选音学习进度(100为已完成)")
private Integer look;
/**
* 故事名称
*/
- @ApiModelProperty(value = "归纳排除学习进度")
+ @ApiModelProperty(value = "归纳排除学习进度(100为已完成)")
private Integer induction;
/**
* 故事名称
*/
- @ApiModelProperty(value = "有问有答学习进度")
+ @ApiModelProperty(value = "有问有答学习进度(100为已完成)")
private Integer answer;
/**
* 故事名称
*/
- @ApiModelProperty(value = "音图相配学习进度")
+ @ApiModelProperty(value = "音图相配学习进度(100为已完成)")
private Integer pair;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
index a1b554a..dbee09b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
@@ -12,9 +12,9 @@
public class CompleteGameDTO {
/**
- * 游戏难度
+ * 游戏难度(0入门、1中级、2高级)
*/
- @ApiModelProperty("游戏难度")
+ @ApiModelProperty("游戏难度(0入门、1中级、2高级)")
private Integer difficulty;
/**
@@ -42,6 +42,12 @@
private Integer accuracy;
/**
+ * 根据正确率计算可获得积分数量
+ */
+ @ApiModelProperty("根据正确率计算可获得积分数量")
+ private Integer availableIntegral;
+
+ /**
* 完成听故事、完成游戏、完成答题、完成每日学习、商城消费
*/
@ApiModelProperty("完成听故事、完成游戏、完成答题、完成每日学习、商城消费")
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteStudyDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteStudyDTO.java
index 5ff2e94..e04065c 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteStudyDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteStudyDTO.java
@@ -23,4 +23,10 @@
@ApiModelProperty("完成听故事、完成游戏、完成答题、完成每日学习、商城消费、分享")
private String method;
+ /**
+ * 该学习是否完成
+ */
+ @ApiModelProperty("该学习是否完成(如果已完成再次进入学习并完成学习后，该字段传值 false)")
+ private Boolean isComplete;
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITGameService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITGameService.java
index ee1f02a..0265f5b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITGameService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITGameService.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.study.domain.TGame;
+import com.ruoyi.study.domain.TIntegralRecord;
+import com.ruoyi.study.dto.CompleteGameDTO;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +17,14 @@
*/
public interface ITGameService extends IService<TGame> {
+ /**
+ * 根据正确率计算用户本次游戏可获得的积分数量
+ *
+ * @param userid 用户id
+ * @param game 游戏信息
+ * @param integralRecordList 积分明细信息
+ * @param completeStudy 游戏测试信息
+ * @return 可获得积分数量
+ */
+ Integer countIntegral(Integer userid ,TGame game, CompleteGameDTO completeStudy, List<TIntegralRecord> integralRecordList);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
index bff7d31..cc51dbe 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
@@ -30,7 +30,9 @@
*
* @param integral 积分 (增加积分+ 、减少积分-)
* @param method 积分来源
+ * @param gameId 游戏id
+ * @param storyId 故事id
* @return 操作结果
*/
- Boolean add(String integral, String method);
+ Boolean add(String integral, String method, Integer gameId, Integer storyId);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TGameServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TGameServiceImpl.java
index 9d407ce..420ff1e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TGameServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TGameServiceImpl.java
@@ -2,9 +2,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.study.domain.TGame;
+import com.ruoyi.study.domain.TIntegralRecord;
+import com.ruoyi.study.dto.CompleteGameDTO;
import com.ruoyi.study.mapper.TGameMapper;
import com.ruoyi.study.service.ITGameService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +22,22 @@
@Service
public class TGameServiceImpl extends ServiceImpl<TGameMapper, TGame> implements ITGameService {
+ @Override
+ public Integer countIntegral(Integer userid, TGame game, CompleteGameDTO completeStudy, List<TIntegralRecord> integralRecordList) {
+ // 本次游戏可获得积分数量
+ Integer availableIntegral = completeStudy.getAvailableIntegral();
+ // 积分明细集合为空，当前为第一次完成游戏
+ if (integralRecordList.isEmpty()) {
+ return availableIntegral;
+ } else {
+ // 积分明细不为空，计算已获取的积分数量
+ List<Integer> integralList = integralRecordList.stream().map(TIntegralRecord::getIntegral).collect(Collectors.toList()).stream().map(Integer::parseInt).collect(Collectors.toList());
+ int sumIntegral = integralList.stream().mapToInt(Integer::intValue).sum();
+ if (availableIntegral > sumIntegral) {
+ return availableIntegral - sumIntegral;
+ } else {
+ return null;
+ }
+ }
+ }
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
index 4fe82d2..6d0047f 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.study.domain.TIntegralRecord;
import com.ruoyi.study.mapper.TIntegralRecordMapper;
import com.ruoyi.study.service.ITIntegralRecordService;
@@ -34,11 +33,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean add(String integral, String method) {
+ public Boolean add(String integral, String method, Integer gameId, Integer storyId) {
TIntegralRecord integralRecord = new TIntegralRecord();
integralRecord.setIntegral(integral);
integralRecord.setMethod(method);
integralRecord.setUserId(tokenService.getLoginUserStudy().getUserid());
+ integralRecord.setGameId(gameId);
+ integralRecord.setStoryId(storyId);
return this.save(integralRecord);
}
}
--
Gitblit v1.7.1