From e0504d28a1fc10be6979d36fb93b936ef49ffcf4 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 17:09:32 +0800
Subject: [PATCH] 积分明细的字段优化
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 2
/dev/null | 35 -----------------
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 16 +++-----
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralsData.java | 22 +++++++++++
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java | 4 +-
5 files changed, 31 insertions(+), 48 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 8f7f0df..16f1915 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -383,7 +383,7 @@
@ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
@ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
})
- public ResultUtil<IntegralDetailsResponse> pointDetails(String yearMonth, Integer recordId){
+ public ResultUtil<List<IntegralsData>> pointDetails(String yearMonth, Integer recordId){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralDetailsResponse.java
deleted file mode 100644
index 32a6fed..0000000
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralDetailsResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dsh.account.model.vo.userBenefitDetail;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class IntegralDetailsResponse {
-
- @ApiModelProperty(value = "可用积分")
- private Integer wpGold;
-
- @ApiModelProperty(value = "记录列表")
- private List<IntegralsData> detailList;
-
- @Data
- public static class IntegralsData{
-
- @ApiModelProperty(value = "名称")
- private String consumeName;
-
- @ApiModelProperty(value = "时间")
- private String consumeTime;
-
- @ApiModelProperty(value = "金额 例如 -90 ")
- private String consumeAmount;
-
- @ApiModelProperty(value = "1扣减 2增加")
- private Integer detailsType;
-
- }
-
-}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralsData.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralsData.java
new file mode 100644
index 0000000..0c4b2b2
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IntegralsData.java
@@ -0,0 +1,22 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class IntegralsData {
+
+ @ApiModelProperty(value = "名称")
+ private String consumeName;
+
+ @ApiModelProperty(value = "时间")
+ private String consumeTime;
+
+ @ApiModelProperty(value = "金额 例如 -90 ")
+ private String consumeAmount;
+
+ @ApiModelProperty(value = "1扣减 2增加")
+ private Integer detailsType;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
index b45c68a..c753574 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
@@ -4,7 +4,7 @@
import com.dsh.account.entity.UserIntegralChanges;
import com.dsh.account.model.SaveUserIntegralChangesVo;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
-import com.dsh.account.model.vo.userBenefitDetail.IntegralDetailsResponse;
+import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import java.util.List;
@@ -19,7 +19,7 @@
*/
public interface UserIntegralChangesService extends IService<UserIntegralChanges> {
- IntegralDetailsResponse queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);
+ List<IntegralsData> queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis);
/**
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 e04b185..68321ea 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
@@ -9,7 +9,7 @@
import com.dsh.account.mapper.UserIntegralChangesMapper;
import com.dsh.account.model.SaveUserIntegralChangesVo;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
-import com.dsh.account.model.vo.userBenefitDetail.IntegralDetailsResponse;
+import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.service.UserIntegralChangesService;
import com.dsh.account.util.DateTimeHelper;
@@ -43,9 +43,8 @@
private MerChandiseClient mcClient;
@Override
- public IntegralDetailsResponse queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis) {
- IntegralDetailsResponse vo = new IntegralDetailsResponse();
- List<IntegralDetailsResponse.IntegralsData> details = new ArrayList<>();
+ public List<IntegralsData> queryUserPointsDetails(String yearMonth, Integer recordId, Integer userIdFormRedis) {
+ List<IntegralsData> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
Date monthStart = null;
@@ -63,7 +62,7 @@
.orderByDesc("insertTime"));
if (userIntegralChanges.size() > 0 ){
for (UserIntegralChanges userIntegralChange : userIntegralChanges) {
- IntegralDetailsResponse.IntegralsData detail= new IntegralDetailsResponse.IntegralsData();
+ IntegralsData detail= new IntegralsData();
switch (userIntegralChange.getType()){
case 1:
detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
@@ -94,15 +93,12 @@
}
if (null != recordId){
details = details.stream()
- .filter(obj -> obj instanceof IntegralDetailsResponse.IntegralsData)
+ .filter(obj -> obj instanceof IntegralsData)
.filter(obj -> Objects.equals(obj.getDetailsType(), recordId))
.collect(Collectors.toList());
}
- TAppUser tAppUser = tauMapper.selectById(userIdFormRedis);
- vo.setWpGold(tAppUser.getIntegral());
- vo.setDetailList(details);
}
- return vo;
+ return details;
}
--
Gitblit v1.7.1