From 80b5033b8d5b918c7ca2523bc2a69139c2bab438 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 15 六月 2024 19:21:33 +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/service/impl/TGameServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
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 1e81be3..3eb6401 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
@@ -23,21 +23,26 @@
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();
+ public Integer countIntegral(Integer userid, TGame game, CompleteGameDTO completeStudy,
+ Integer gameAvailableIntegral, List<TIntegralRecord> integralRecordList) {
// 积分明细集合为空，当前为第一次完成游戏
if (integralRecordList.isEmpty()) {
- return availableIntegral;
+ return gameAvailableIntegral;
} else {
// 积分明细不为空，根据正确率及已获取积分数量计算本次答题可获取的积分数量
- List<Integer> integralList = integralRecordList.stream().map(TIntegralRecord::getIntegral).collect(Collectors.toList()).stream().map(Integer::parseInt).collect(Collectors.toList());
+ 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;
+ if (gameAvailableIntegral > sumIntegral) {
+ return gameAvailableIntegral - sumIntegral;
} else {
return null;
}
}
}
+
+ @Override
+ public TGame gameHearing(Integer quarter, Integer week) {
+ return baseMapper.gameHearing(quarter, week);
+ }
}
--
Gitblit v1.7.1