wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正成就查询

Browse Source
This commit is contained in:
wangys
2025-11-28 18:55:31 +08:00
parent fc960265f4
commit 990910d2c6
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schoolNewsServ/.bin/mysql/sql/initAchievementData.sql
View File

@@ -5,7 +5,7 @@
-- 等级成就
-- V1段：初学者 (0-10小时，每2小时一级)
INSERT INTO `tb_achievement` (`id`, `achievement_id`, `name`,`icon`, `description`, `type`, `level`, `condition_type`, `condition_value`, `points`, `order_num`, `deleted`) VALUES
('ACH001', 'learning_time_l1_1', '初学者 I', 'v1-icon.svg', '开始学习之旅', 2, 1.1, 1, 0, 5, 1, 0),
('ACH001', 'learning_time_l1_1', '初学者 I', 'v1-icon.svg', '开始学习之旅', 2, 1.1, 1, 60*60, 5, 1, 0),
('ACH002', 'learning_time_l1_2', '初学者 II', 'v1-icon.svg', '累计学习时长达到2小时', 2, 1.2, 1, 2*60*60, 10, 2, 0),
('ACH003', 'learning_time_l1_3', '初学者 III', 'v1-icon.svg', '累计学习时长达到4小时', 2, 1.3, 1, 4*60*60, 15, 3, 0),
('ACH004', 'learning_time_l1_4', '初学者 IV', 'v1-icon.svg', '累计学习时长达到6小时', 2, 1.4, 1, 6*60*60, 20, 4, 0),

33
schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java
View File

@@ -298,7 +298,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
Map<String, Object> payload = new HashMap<>();
payload.put("current", null);
payload.put("next", null);
rd.success("无等级成就", payload);
rd.success("无等级成就配置", payload);
return rd;
}
@@ -315,36 +315,35 @@ public class ACHAchievementServiceImpl implements AchievementService {
Comparator.nullsFirst(Comparator.naturalOrder())
);
// 当前：已获得的最高等级，否则取最低等级
// 当前：已获得的最高等级
List<AchievementVO> obtained = levels.stream()
.filter(a -> Boolean.TRUE.equals(a.getObtained()))
.sorted(byLevelAsc.reversed())
.collect(Collectors.toList());
AchievementVO current;
final float currentLevel; // 用户实际等级
if (!obtained.isEmpty()) {
// 已获得等级成就，取最高等级
current = obtained.get(0);
currentLevel = current.getLevel() != null ? current.getLevel() : 1.0f;
} else {
current = levels.stream()
.sorted(byLevelAsc)
.findFirst()
.orElse(null);
// 没有获得任何等级成就，默认 Lv1.0
current = null;
currentLevel = 1.0f;
}
// 下一等级：比当前等级大的最小等级
AchievementVO next = null;
if (current != null && current.getLevel() != null) {
float curLevel = current.getLevel();
next = levels.stream()
.filter(a -> (a.getLevel() != null) && a.getLevel() > curLevel)
.sorted(byLevelAsc)
.findFirst()
.orElse(null);
}
AchievementVO next = levels.stream()
.filter(a -> (a.getLevel() != null) && a.getLevel() > currentLevel)
.sorted(byLevelAsc)
.findFirst()
.orElse(null);
Map<String, Object> payload = new HashMap<>();
payload.put("current", current);
payload.put("next", next);
payload.put("current", current); // 当前获得的最高等级成就，null 表示默认 Lv1.0
payload.put("next", next); // 下一个等级成就
rd.success("获取等级状态成功", payload);
return rd;
} catch (Exception e) {