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/service/impl/ApiMallMemberWalletServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 42 insertions(+), 5 deletions(-) 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, -- Gitblit v1.9.1