From 4bc5ffbb8d2e50824539e727d7960f864df17e37 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 28 Jan 2024 22:33:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 4 +++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 15c18c1..1e4ab20 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -385,11 +385,11 @@
moneyFlowDto.setMemberId(id);
IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
-// if (moneyFlowDto.getFlowType() == 3) {
-// pages.getRecords().forEach(item -> {
-// item.setDescription(ScoreFlowTypeEnum.getDescByValue(item.getType()));
-// });
-// }
+ if (moneyFlowDto.getFlowType() == 3) {
+ pages.getRecords().forEach(item -> {
+ item.setDescription(ScoreFlowTypeEnum.getDescByValue(item.getType()));
+ });
+ }
return new FebsResponse().success().data(pages);
}
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index 1693591..cd15ede 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -28,6 +28,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -59,11 +60,12 @@
name = mallVipBenefits.getName();
}
+ List<String> skuNames = mallOrderInfo.getItems().stream().map(MallOrderItem::getSkuName).collect(Collectors.toList());
double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
int score = multiple.multiply(BigDecimal.valueOf(sum)).intValue();
- mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), name, 2);
+ mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
mallMemberWalletService.add(new BigDecimal(score), memberId, "prizeScore");
}
--
Gitblit v1.9.1