From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 22d3b45..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
@@ -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());
}
}
@@ -175,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)){
@@ -189,6 +191,9 @@
}
}
+
+
+
int totalItems = detailsResponses.size();
int startIndex = (page - 1) * size;
int endIndex = Math.min(startIndex + size, totalItems);
--
Gitblit v1.7.1