From a1e4cfc3de4f3f3f3956b769bc7af40d097c8a4c Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 17 十月 2023 15:12:57 +0800 Subject: [PATCH] 修改bug --- cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 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 753b6a0..b49a895 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 @@ -146,8 +146,9 @@ } @Override - public PointDetailsVo queryRedemptionDetails(Integer detailsId) { - return mcClient.getSpecificsOfGoods(detailsId); + public PointDetailsVo queryRedemptionDetails(Long detailsId) { + PointDetailsVo specificsOfGoods = mcClient.getSpecificsOfGoods(detailsId); + return specificsOfGoods; } @Override @@ -168,4 +169,35 @@ } return userIntegrals; } + + @Override + 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)){ + detailsResponses = detailsResponses.stream() + .filter(response -> Objects.equals(response.getUseStatus(), useType)) + .collect(Collectors.toList()); + } + if (ToolUtil.isNotEmpty(goodType)){ + detailsResponses = detailsResponses.stream() + .filter(response -> Objects.equals(response.getGoodType(), goodType)) + .collect(Collectors.toList()); + } + } + + int totalItems = detailsResponses.size(); + int startIndex = (page - 1) * size; + int endIndex = Math.min(startIndex + size, totalItems); + + if (startIndex <= endIndex) { + detailsResponses = detailsResponses.subList(startIndex, endIndex); + } else { + detailsResponses.clear(); + } + + return detailsResponses; + } } -- Gitblit v1.7.1