From ad30586e75890d8d7ccdb18913a4d7c8c228456a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 10:06:24 +0800
Subject: [PATCH] feat(mall): 添加积分兑换比例设置功能
---
src/main/java/cc/mrbird/febs/mall/dto/ScoreSettingDto.java | 2 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 47 +++++++++++++++++++++--
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 23 ++++++++---
src/main/resources/templates/febs/views/modules/score/setting.html | 7 +++
4 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ScoreSettingDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ScoreSettingDto.java
index bb45c25..e16fecc 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ScoreSettingDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ScoreSettingDto.java
@@ -21,4 +21,6 @@
private Integer signInMore;
//1:会员经验 2:会员积分
private Integer mostSignIn;
+ //积分比例
+ private Integer scorePercent;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
index d82582f..6804975 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
@@ -7,12 +8,17 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.CommissionChangeDto;
+import cc.mrbird.febs.mall.dto.ScoreSettingDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +27,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Map;
/**
@@ -33,6 +40,7 @@
public class ApiMallMemberWalletServiceImpl extends ServiceImpl<MallMemberWalletMapper, MallMemberWallet> implements IApiMallMemberWalletService {
private final IMallMoneyFlowService moneyFlowService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
public void addBalance(BigDecimal amount, Long memberId) {
@@ -242,23 +250,52 @@
public void commissionChange(CommissionChangeDto commissionChange) {
MallMember member = LoginUserUtil.getLoginUser();
+ BigDecimal amount = commissionChange.getAmount();
+ if (amount.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new FebsException("参数错误");
+ }
+ MallMemberWallet mallMemberWallet = this.baseMapper.selectWalletByMemberId(member.getId());
+ if (mallMemberWallet.getCommission().compareTo(amount) < 0) {
+ throw new FebsException("佣金不足");
+ }
+
+ BigDecimal scorePercent = BigDecimal.ONE;
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
+ if (dic != null) {
+ ScoreSettingDto scoreSettingDto = JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class);
+ BigDecimal bigDecimal = ObjectUtil.isEmpty(scoreSettingDto.getScorePercent()) ? BigDecimal.ONE : new BigDecimal(scoreSettingDto.getScorePercent());
+ if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+ scorePercent = bigDecimal;
+ }
+ }
+
// TODO 判断是否开启了划转
int type;
int flowType;
+ String desc = null;
+ BigDecimal addAmount = BigDecimal.ZERO;
this.reduce(commissionChange.getAmount(), member.getId(), "commission");
// 佣金转余额
if (commissionChange.getType() == 1) {
type = ScoreFlowTypeEnum.COMMISSION_TO_BALANCE.getValue();
flowType = FlowTypeEnum.BALANCE.getValue();
- this.add(commissionChange.getAmount(), member.getId(), "balance");
+ addAmount = commissionChange.getAmount();
+ desc = String.format(ScoreFlowTypeEnum.COMMISSION_TO_BALANCE.getDesc(), commissionChange.getAmount());
- // 佣金转竞猜积分
+ this.add(addAmount, member.getId(), "balance");
+
+ // 佣金转积分
} else if (commissionChange.getType() == 2){
type = ScoreFlowTypeEnum.COMMISSION_TO_PRIZE_SCORE.getValue();
flowType = FlowTypeEnum.PRIZE_SCORE.getValue();
- this.add(commissionChange.getAmount(), member.getId(), "prizeScore");
+ desc = String.format(ScoreFlowTypeEnum.COMMISSION_TO_PRIZE_SCORE.getDesc(), commissionChange.getAmount());
+ addAmount = commissionChange.getAmount().multiply(scorePercent).setScale(0, RoundingMode.HALF_DOWN);
+
+ this.add(addAmount, member.getId(), "prizeScore");
} else {
throw new FebsException("操作失败");
}
@@ -269,13 +306,13 @@
type,
MallUtils.getOrderNum(),
FlowTypeEnum.COMMISSION.getValue(),
- String.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ desc,
2
);
moneyFlowService.addMoneyFlow(
member.getId(),
- commissionChange.getAmount(),
+ addAmount,
type,
MallUtils.getOrderNum(),
flowType,
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 1740893..7fcf385 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
@@ -1,10 +1,8 @@
package cc.mrbird.febs.vip.service.impl;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
-import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallGoodsService;
@@ -22,6 +20,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -54,6 +53,7 @@
private final HappyMemberLevelMapper happyMemberLevelMapper;
private final HappySaleLevelMapper happySaleLevelMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
/**
* 根据订单ID获取分数
* 此方法处理订单得分逻辑，包括直接购买得分、会员等级得分和推荐人得分
@@ -99,6 +99,17 @@
);
// 更新会员钱包中的分数
mallMemberWalletService.add(amount, memberId, "score");
+ BigDecimal scorePercent = BigDecimal.ONE;
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getType(),
+ DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
+ if (dic != null) {
+ ScoreSettingDto scoreSettingDto = JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class);
+ BigDecimal bigDecimal = ObjectUtil.isEmpty(scoreSettingDto.getScorePercent()) ? BigDecimal.ONE : new BigDecimal(scoreSettingDto.getScorePercent());
+ if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+ scorePercent = bigDecimal;
+ }
+ }
// 下单自己获得积分,推荐人获得积分
//<memberId,积分数量>的map
@@ -115,7 +126,7 @@
if(ObjectUtil.isNotEmpty(happyMemberLevel)){
// 计算自己获得的积分
BigDecimal minePercent = happyMemberLevel.getMinePercent();
- BigDecimal mineScore = amount.multiply(minePercent).setScale(0, RoundingMode.HALF_DOWN);
+ BigDecimal mineScore = amount.multiply(minePercent).multiply(scorePercent).setScale(0, RoundingMode.HALF_DOWN);
log.info("下单获得积分:{}", mineScore);
if(mineScore.compareTo(BigDecimal.ZERO) > 0){
mallMoneyFlowService.addMoneyFlow(
@@ -132,7 +143,7 @@
if(StrUtil.isNotEmpty(member.getReferrerId())){
MallMember refMember = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
BigDecimal otherPercent = happyMemberLevel.getOtherPercent();
- BigDecimal otherScore = amount.multiply(otherPercent).setScale(0, RoundingMode.HALF_DOWN);
+ BigDecimal otherScore = amount.multiply(otherPercent).multiply(scorePercent).setScale(0, RoundingMode.HALF_DOWN);
log.info("推荐人获得积分:{}", otherScore);
if(otherScore.compareTo(BigDecimal.ZERO) > 0){
mallMoneyFlowService.addMoneyFlow(
diff --git a/src/main/resources/templates/febs/views/modules/score/setting.html b/src/main/resources/templates/febs/views/modules/score/setting.html
index 7915c1a..527f855 100644
--- a/src/main/resources/templates/febs/views/modules/score/setting.html
+++ b/src/main/resources/templates/febs/views/modules/score/setting.html
@@ -60,6 +60,13 @@
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label ">积分兑换比例（100积分=1元）</label>
+ <div class="layui-input-inline" style="width: 120px">
+ <input type="text" name="scorePercent" lay-verify="number" th:value="${obj != null ? obj.scorePercent : null}" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label ">连续签到</label>-->
<!-- <div class="layui-input-inline" style="width: 120px">-->
--
Gitblit v1.9.1