From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
index 08e324e..cd07796 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -61,7 +61,7 @@
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
List<UserIntegralChanges> userIntegralChanges = this.baseMapper.selectList(new QueryWrapper<UserIntegralChanges>()
- .eq("appUserId", userIdFormRedis)
+ .eq("appUserId", userIdFormRedis).le("type", 5)
.between("insertTime", monthStart, monthEnd)
.orderByDesc("insertTime"));
if (userIntegralChanges.size() > 0) {
@@ -94,6 +94,31 @@
detail.setConsumeName("智慧球场开始游戏");
detail.setDetailsType(1);
break;
+ case 6:
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("参与社区世界杯");
+ detail.setDetailsType(2);
+ break;
+ case 7:
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("社区世界杯获胜");
+ detail.setDetailsType(2);
+ break;
+ case 8:
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("社区世界杯调整比分");
+ detail.setDetailsType(1);
+ break;
+ case 9:
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("社区世界杯平场");
+ detail.setDetailsType(2);
+ break;
+ case 10:
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("社区世界杯败场");
+ detail.setDetailsType(2);
+ break;
default:
break;
}
@@ -118,7 +143,7 @@
* @throws Exception
*/
@Override
- public void saveUserIntegralChanges(SaveUserIntegralChangesVo vo) throws Exception {
+ public void saveUserIntegralChanges(SaveUserIntegralChangesVo vo) {
TAppUser appUser = tauMapper.selectById(vo.getAppUserId());
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
userIntegralChanges.setAppUserId(vo.getAppUserId());
@@ -129,7 +154,7 @@
tauMapper.updateById(appUser);
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
- userIntegralChanges.setCategory(1);
+ userIntegralChanges.setCategory(vo.getIntegral() > 0 ? 1 : 2);
userIntegralChanges.setRemark(vo.getRemark());
this.save(userIntegralChanges);
}
--
Gitblit v1.7.1