From be8a63ba1e3f2e26f5cdefe519c37ad4cfd90435 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期日, 05 十一月 2023 09:45:11 +0800
Subject: [PATCH] 11.5
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 13 +++++++++++--
1 files changed, 11 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..163f753 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;
@@ -98,7 +98,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());
}
}
@@ -119,6 +119,7 @@
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);
@@ -174,6 +175,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 +191,9 @@
}
}
+
+
+
int totalItems = detailsResponses.size();
int startIndex = (page - 1) * size;
int endIndex = Math.min(startIndex + size, totalItems);
@@ -198,6 +204,9 @@
detailsResponses.clear();
}
+
+
+
return detailsResponses;
}
}
--
Gitblit v1.7.1