From f16f74cacb9ef0ae4be89ed15353b6a449479d8c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 28 May 2025 13:38:09 +0800
Subject: [PATCH] feat(mall): 添加轮播图背景图片功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 97 insertions(+), 11 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 7dca4fb..4ea020d 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,16 +1,25 @@
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;
import cc.mrbird.febs.common.exception.FebsException;
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 cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +28,8 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Map;
/**
* @author wzy
@@ -30,6 +41,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) {
@@ -169,7 +181,15 @@
}
@Override
- public void reduce(BigDecimal amount, Long memberId, String field) {
+ public void add(BigDecimal amount, Long memberId, String... field) {
+ String[] fields = field.clone();
+ for (String s : fields) {
+ add(amount, memberId, s);
+ }
+ }
+
+ @Override
+ public int reduce(BigDecimal amount, Long memberId, String field, Map<String, BigDecimal> map) {
int i = 0;
boolean flag = true;
@@ -187,7 +207,21 @@
BigDecimal balance = (BigDecimal) declaredField.get(wallet);
if (amount.compareTo(balance) > 0) {
- throw new FebsException("余额不足");
+ if (map == null) {
+ return 2;
+ }
+
+ // 判断 赠送积分，如果剩下赠送积分不等于0且小于amount, 则扣除所有赠送积分
+ if ("score".equals(field)) {
+ if (balance.compareTo(BigDecimal.ZERO) == 0) {
+ return 2;
+ }
+
+ amount = balance;
+ map.put("amount", amount);
+ } else {
+ return 2;
+ }
}
declaredField.set(update, balance.subtract(amount));
@@ -200,10 +234,16 @@
flag = false;
} else {
if (i > 2) {
- throw new FebsException("余额修改失败");
+ throw new FebsException("操作失败");
}
}
}
+ return 1;
+ }
+
+ @Override
+ public int reduce(BigDecimal amount, Long memberId, String field) {
+ return reduce(amount, memberId, field, null);
}
@Override
@@ -211,28 +251,74 @@
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 = MoneyFlowTypeEnum.COMMISSION_TO_BALANCE.getValue();
+ type = ScoreFlowTypeEnum.COMMISSION_TO_BALANCE.getValue();
flowType = FlowTypeEnum.BALANCE.getValue();
- this.add(commissionChange.getAmount(), member.getId(), "balance");
+ addAmount = commissionChange.getAmount();
+ desc = StrUtil.format(ScoreFlowTypeEnum.COMMISSION_TO_BALANCE.getDesc(), commissionChange.getAmount());
- // 佣金转竞猜积分
+ this.add(addAmount, member.getId(), "balance");
+
+ // 佣金转积分
} else if (commissionChange.getType() == 2){
- type = MoneyFlowTypeEnum.COMMISSION_TO_PRIZESCORE.getValue();
+ type = ScoreFlowTypeEnum.COMMISSION_TO_PRIZE_SCORE.getValue();
flowType = FlowTypeEnum.PRIZE_SCORE.getValue();
- this.add(commissionChange.getAmount(), member.getId(), "prizeScore");
+ desc = StrUtil.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("参数错误");
+ throw new FebsException("操作失败");
}
- moneyFlowService.addMoneyFlow(member.getId(), commissionChange.getAmount().negate(), type, null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(member.getId(), commissionChange.getAmount(), type, null, flowType);
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ commissionChange.getAmount().negate(),
+ type,
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.COMMISSION.getValue(),
+ desc,
+ 2
+ );
+
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ addAmount,
+ type,
+ MallUtils.getOrderNum(),
+ flowType,
+ StrUtil.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ 2
+ );
}
}
--
Gitblit v1.9.1