From 6e39306a7fc83890659f098ed9c6c5f686a6371b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 11:54:08 +0800
Subject: [PATCH] feat(mall): 优化新人礼领取逻辑并添加领取状态字段- 优化新人礼领取逻辑，检查优惠券是否存在且状态为有效 - 在 MallMemberVo 中添加 newGift 字段，用于表示是否领取新人礼
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
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 7fcf385..b6d2cc3 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
@@ -86,19 +86,6 @@
Long memberId = mallOrderInfo.getMemberId();
// 根据会员ID查询会员信息
MallMember member = mallMemberMapper.selectById(memberId);
-
- // 记录会员购买获得的经验
- mallMoneyFlowService.addMoneyFlow(
- memberId,
- amount,
- ScoreFlowTypeEnum.BUY.getValue(),
- mallOrderInfo.getOrderNo(),
- FlowTypeEnum.SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),amount),
- 2
- );
- // 更新会员钱包中的分数
- mallMemberWalletService.add(amount, memberId, "score");
BigDecimal scorePercent = BigDecimal.ONE;
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
@@ -138,6 +125,20 @@
StrUtil.format( ScoreFlowTypeEnum.MINE_RECOMMEND.getDesc(),mineScore),
2);
mallMemberWalletService.add(mineScore,memberId , "prizeScore");
+
+ // 记录会员购买获得的经验
+ BigDecimal multiply = amount.multiply(minePercent).setScale(2, RoundingMode.HALF_DOWN);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ multiply,
+ ScoreFlowTypeEnum.BUY.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),multiply),
+ 2
+ );
+ // 更新会员钱包中的分数
+ mallMemberWalletService.add(multiply, memberId, "score");
}
// 计算推荐人获得的积分
if(StrUtil.isNotEmpty(member.getReferrerId())){
@@ -155,6 +156,20 @@
StrUtil.format( ScoreFlowTypeEnum.OTHER_RECOMMEND.getDesc(),otherScore),
2);
mallMemberWalletService.add(otherScore,refMember.getId() , "prizeScore");
+
+ // 记录会员购买获得的经验
+ BigDecimal multiply = amount.multiply(otherPercent).setScale(2, RoundingMode.HALF_DOWN);
+ mallMoneyFlowService.addMoneyFlow(
+ refMember.getId(),
+ multiply,
+ ScoreFlowTypeEnum.BUY.getValue(),
+ mallOrderInfo.getOrderNo(),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.BUY.getDesc(),multiply),
+ 2
+ );
+ // 更新会员钱包中的分数
+ mallMemberWalletService.add(multiply, refMember.getId(), "score");
}
}
}
--
Gitblit v1.9.1