From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 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 4869ee0..3e1b4cd 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,37 +61,52 @@
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
List<UserIntegralChanges> userIntegralChanges = this.baseMapper.selectList(new QueryWrapper<UserIntegralChanges>()
- .eq("appUserId",userIdFormRedis )
- .between("insertTime",monthStart,monthEnd)
+ .eq("appUserId", userIdFormRedis)
+ .between("insertTime", monthStart, monthEnd)
.orderByDesc("insertTime"));
- if (userIntegralChanges.size() > 0 ){
+ if (userIntegralChanges.size() > 0) {
for (UserIntegralChanges userIntegralChange : userIntegralChanges) {
- IntegralsData detail= new IntegralsData();
- switch (userIntegralChange.getType()){
+ IntegralsData detail = new IntegralsData();
+ switch (userIntegralChange.getType()) {
case 1:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("赠送积分");
detail.setDetailsType(2);
break;
case 2:
- detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("兑换商品");
detail.setDetailsType(1);
break;
case 3:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("完成课后练习");
detail.setDetailsType(2);
break;
case 4:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeTime(simpleDateFormat.format(userIntegralChange.getInsertTime()));
detail.setConsumeName("观看教学视频");
detail.setDetailsType(2);
break;
case 5:
- detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
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;
default:
@@ -100,7 +115,7 @@
detail.setConsumeTime(simpleDateFormat.format(userIntegralChange.getInsertTime()));
details.add(detail);
}
- if (null != recordId){
+ if (null != recordId) {
details = details.stream()
.filter(obj -> obj instanceof IntegralsData)
.filter(obj -> !Objects.equals(obj.getDetailsType(), recordId))
@@ -113,11 +128,12 @@
/**
* 保存用户积分变动
+ *
* @param vo
* @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());
@@ -128,7 +144,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);
}
@@ -137,14 +153,14 @@
public List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType) {
List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
- if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())) {
detailsResponses = integralExchangeDetails.getDetailsResponses();
- if (ToolUtil.isNotEmpty(useType)){
+ if (ToolUtil.isNotEmpty(useType)) {
detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
.filter(response -> Objects.equals(response.getUseStatus(), useType))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(goodType)){
+ if (ToolUtil.isNotEmpty(goodType)) {
detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
.filter(response -> Objects.equals(response.getGoodType(), goodType))
.collect(Collectors.toList());
@@ -161,18 +177,18 @@
@Override
public Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
- String sTime =null;
- String eTime =null;
- if(ToolUtil.isNotEmpty(integralListQuery.getTime())){
- sTime = integralListQuery.getTime().split(" - ")[0]+" 00:00:00";
- eTime = integralListQuery.getTime().split(" - ")[1]+" 23:59:59";
+ String sTime = null;
+ String eTime = null;
+ if (ToolUtil.isNotEmpty(integralListQuery.getTime())) {
+ sTime = integralListQuery.getTime().split(" - ")[0] + " 00:00:00";
+ eTime = integralListQuery.getTime().split(" - ")[1] + " 23:59:59";
}
Page<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
for (UserIntegral userIntegral : userIntegrals.getRecords()) {
- if(userIntegral.getCategory()==1){
- userIntegral.setIntegral(userIntegral.getNewIntegral()-userIntegral.getOldIntegral());
- }else {
- userIntegral.setIntegral(userIntegral.getOldIntegral()-userIntegral.getNewIntegral());
+ if (userIntegral.getCategory() == 1) {
+ userIntegral.setIntegral(userIntegral.getNewIntegral() - userIntegral.getOldIntegral());
+ } else {
+ userIntegral.setIntegral(userIntegral.getOldIntegral() - userIntegral.getNewIntegral());
}
}
return userIntegrals;
@@ -184,21 +200,19 @@
ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
- if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())) {
detailsResponses = integralExchangeDetails.getDetailsResponses();
- if (ToolUtil.isNotEmpty(useType)){
+ if (ToolUtil.isNotEmpty(useType)) {
detailsResponses = detailsResponses.stream()
.filter(response -> Objects.equals(response.getUseStatus(), useType))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(goodType)){
+ if (ToolUtil.isNotEmpty(goodType)) {
detailsResponses = detailsResponses.stream()
.filter(response -> Objects.equals(response.getGoodType(), goodType))
.collect(Collectors.toList());
}
}
-
-
int totalItems = detailsResponses.size();
@@ -210,8 +224,6 @@
} else {
detailsResponses.clear();
}
-
-
return detailsResponses;
--
Gitblit v1.7.1