From 8e2d31e804cd7fd5736c9c2e7b755b153b462f7a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 13 十月 2023 14:02:20 +0800
Subject: [PATCH] 10.12
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 47408ef..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
@@ -121,6 +121,7 @@
appUser.setIntegral(appUser.getIntegral() + vo.getIntegral());
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
+ userIntegralChanges.setCategory(1);
this.save(userIntegralChanges);
}
@@ -145,20 +146,21 @@
}
@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