From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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 | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 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 4eb962e..08e324e 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
@@ -61,36 +61,36 @@
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
List<UserIntegralChanges> userIntegralChanges = this.baseMapper.selectList(new QueryWrapper<UserIntegralChanges>()
- .eq("appUserId",userIdFormRedis )
- .between("insertTime",monthStart,monthEnd)
+ .eq("appUserId", userIdFormRedis)
+ .between("insertTime", monthStart, monthEnd)
.orderByDesc("insertTime"));
- if (userIntegralChanges.size() > 0 ){
+ if (userIntegralChanges.size() > 0) {
for (UserIntegralChanges userIntegralChange : userIntegralChanges) {
- IntegralsData detail= new IntegralsData();
- switch (userIntegralChange.getType()){
+ IntegralsData detail = new IntegralsData();
+ switch (userIntegralChange.getType()) {
case 1:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("赠送积分");
detail.setDetailsType(2);
break;
case 2:
- detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("兑换商品");
detail.setDetailsType(1);
break;
case 3:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("完成课后练习");
detail.setDetailsType(2);
break;
case 4:
- detail.setConsumeAmount("+"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("+" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeTime(simpleDateFormat.format(userIntegralChange.getInsertTime()));
detail.setConsumeName("观看教学视频");
detail.setDetailsType(2);
break;
case 5:
- detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
+ detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
detail.setConsumeName("智慧球场开始游戏");
detail.setDetailsType(1);
break;
@@ -100,7 +100,7 @@
detail.setConsumeTime(simpleDateFormat.format(userIntegralChange.getInsertTime()));
details.add(detail);
}
- if (null != recordId){
+ if (null != recordId) {
details = details.stream()
.filter(obj -> obj instanceof IntegralsData)
.filter(obj -> !Objects.equals(obj.getDetailsType(), recordId))
@@ -113,6 +113,7 @@
/**
* 保存用户积分变动
+ *
* @param vo
* @throws Exception
*/
@@ -137,14 +138,14 @@
public List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType) {
List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
- if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())) {
detailsResponses = integralExchangeDetails.getDetailsResponses();
- if (ToolUtil.isNotEmpty(useType)){
+ if (ToolUtil.isNotEmpty(useType)) {
detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
.filter(response -> Objects.equals(response.getUseStatus(), useType))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(goodType)){
+ if (ToolUtil.isNotEmpty(goodType)) {
detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
.filter(response -> Objects.equals(response.getGoodType(), goodType))
.collect(Collectors.toList());
@@ -161,18 +162,18 @@
@Override
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";
+ 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";
}
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 {
- userIntegral.setIntegral(userIntegral.getOldIntegral()-userIntegral.getNewIntegral());
+ if (userIntegral.getCategory() == 1) {
+ userIntegral.setIntegral(userIntegral.getNewIntegral() - userIntegral.getOldIntegral());
+ } else {
+ userIntegral.setIntegral(userIntegral.getOldIntegral() - userIntegral.getNewIntegral());
}
}
return userIntegrals;
@@ -182,19 +183,23 @@
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())){
+
+
+ if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())) {
detailsResponses = integralExchangeDetails.getDetailsResponses();
- if (ToolUtil.isNotEmpty(useType)){
+ if (ToolUtil.isNotEmpty(useType)) {
detailsResponses = detailsResponses.stream()
.filter(response -> Objects.equals(response.getUseStatus(), useType))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(goodType)){
+ 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);
@@ -204,8 +209,6 @@
} else {
detailsResponses.clear();
}
-
-
return detailsResponses;
--
Gitblit v1.7.1