From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 b49a895..4869ee0 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
@@ -74,7 +74,7 @@
detail.setDetailsType(2);
break;
case 2:
- detail.setConsumeAmount("-"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("兑换商品");
detail.setDetailsType(1);
break;
@@ -89,6 +89,11 @@
detail.setConsumeName("观看教学视频");
detail.setDetailsType(2);
break;
+ case 5:
+ detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeName("智慧球场开始游戏");
+ detail.setDetailsType(1);
+ break;
default:
break;
}
@@ -98,7 +103,7 @@
if (null != recordId){
details = details.stream()
.filter(obj -> obj instanceof IntegralsData)
- .filter(obj -> Objects.equals(obj.getDetailsType(), recordId))
+ .filter(obj -> !Objects.equals(obj.getDetailsType(), recordId))
.collect(Collectors.toList());
}
}
@@ -118,10 +123,13 @@
userIntegralChanges.setAppUserId(vo.getAppUserId());
userIntegralChanges.setOldIntegral(appUser.getIntegral());
userIntegralChanges.setType(vo.getType());
+
appUser.setIntegral(appUser.getIntegral() + vo.getIntegral());
+ tauMapper.updateById(appUser);
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
userIntegralChanges.setCategory(1);
+ userIntegralChanges.setRemark(vo.getRemark());
this.save(userIntegralChanges);
}
@@ -174,6 +182,8 @@
public List<ExchangeDetailsResponse> queryExchangeGoodsdetails1(Integer userIdFormRedis, Integer useType, Integer goodType, Integer page, Integer size) {
List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
+
+
if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
detailsResponses = integralExchangeDetails.getDetailsResponses();
if (ToolUtil.isNotEmpty(useType)){
@@ -188,6 +198,9 @@
}
}
+
+
+
int totalItems = detailsResponses.size();
int startIndex = (page - 1) * size;
int endIndex = Math.min(startIndex + size, totalItems);
@@ -198,6 +211,9 @@
detailsResponses.clear();
}
+
+
+
return detailsResponses;
}
}
--
Gitblit v1.7.1