From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 238dd4d..a5faf58 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
@@ -12,6 +12,7 @@
import com.dsh.account.model.IntegralListQuery;
import com.dsh.account.model.SaveUserIntegralChangesVo;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
+import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.service.UserIntegralChangesService;
@@ -120,40 +121,46 @@
appUser.setIntegral(appUser.getIntegral() + vo.getIntegral());
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
+ userIntegralChanges.setCategory(1);
this.save(userIntegralChanges);
}
@Override
public List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType) {
- List<ExchangeDetailsResponse> integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
- if (ToolUtil.isNotEmpty(useType)){
- integralExchangeDetails = integralExchangeDetails.stream()
- .filter(response -> Objects.equals(response.getUseStatus(), useType))
- .collect(Collectors.toList());
+ List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
+ ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
+ detailsResponses = integralExchangeDetails.getDetailsResponses();
+ if (ToolUtil.isNotEmpty(useType)){
+ detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
+ .filter(response -> Objects.equals(response.getUseStatus(), useType))
+ .collect(Collectors.toList());
+ }
+ if (ToolUtil.isNotEmpty(goodType)){
+ detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
+ .filter(response -> Objects.equals(response.getGoodType(), goodType))
+ .collect(Collectors.toList());
+ }
}
- if (ToolUtil.isNotEmpty(goodType)){
- integralExchangeDetails = integralExchangeDetails.stream()
- .filter(response -> Objects.equals(response.getGoodType(), goodType))
- .collect(Collectors.toList());
- }
- return integralExchangeDetails;
+ return detailsResponses;
}
@Override
- public PointDetailsVo queryRedemptionDetails(Integer detailsId) {
- return mcClient.getSpecificsOfGoods(detailsId);
+ public PointDetailsVo queryRedemptionDetails(Long detailsId) {
+ PointDetailsVo specificsOfGoods = mcClient.getSpecificsOfGoods(detailsId);
+ return specificsOfGoods;
}
@Override
- public List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
+ 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";
}
- List<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
- for (UserIntegral userIntegral : userIntegrals) {
+ 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 {
--
Gitblit v1.7.1