From 61a8a1b57718b83b6f8ac09e817fabf09e96fdc0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 18:01:56 +0800
Subject: [PATCH] fix(member): 修正会员累计订单统计
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 96 insertions(+), 8 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 28febbf..d82582f 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,27 @@
package cc.mrbird.febs.mall.service.impl;
+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.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.util.Map;
/**
* @author wzy
@@ -21,6 +32,7 @@
@RequiredArgsConstructor
public class ApiMallMemberWalletServiceImpl extends ServiceImpl<MallMemberWalletMapper, MallMemberWallet> implements IApiMallMemberWalletService {
+ private final IMallMoneyFlowService moneyFlowService;
@Override
public void addBalance(BigDecimal amount, Long memberId) {
@@ -131,7 +143,6 @@
while (flag) {
i++;
MallMemberWallet wallet = this.baseMapper.selectWalletByMemberId(memberId);
- wallet.setCommission(wallet.getCommission().add(amount));
MallMemberWallet update = new MallMemberWallet();
update.setId(wallet.getId());
@@ -141,13 +152,15 @@
try {
declaredField = MallMemberWallet.class.getDeclaredField(field);
declaredField.setAccessible(true);
- declaredField.set(update, amount);
+
+ BigDecimal balance = (BigDecimal) declaredField.get(wallet);
+ declaredField.set(update, balance.add(amount));
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
throw new FebsException("金额新增失败");
}
- int result = this.baseMapper.updateAmountWithVersion(wallet);
+ int result = this.baseMapper.updateAmountWithVersion(update);
if (result > 0) {
flag = false;
} else {
@@ -159,7 +172,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;
@@ -177,22 +198,89 @@
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, wallet.getCommission().subtract(amount));
+ declaredField.set(update, balance.subtract(amount));
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
- int result = this.baseMapper.updateAmountWithVersion(wallet);
+ int result = this.baseMapper.updateAmountWithVersion(update);
if (result > 0) {
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
+ @Transactional(rollbackFor = Exception.class)
+ public void commissionChange(CommissionChangeDto commissionChange) {
+ MallMember member = LoginUserUtil.getLoginUser();
+
+ // TODO 判断是否开启了划转
+
+ int type;
+ int flowType;
+ 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");
+
+ // 佣金转竞猜积分
+ } else if (commissionChange.getType() == 2){
+ type = ScoreFlowTypeEnum.COMMISSION_TO_PRIZE_SCORE.getValue();
+ flowType = FlowTypeEnum.PRIZE_SCORE.getValue();
+ this.add(commissionChange.getAmount(), member.getId(), "prizeScore");
+ } else {
+ throw new FebsException("操作失败");
+ }
+
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ commissionChange.getAmount().negate(),
+ type,
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.COMMISSION.getValue(),
+ String.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ 2
+ );
+
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ commissionChange.getAmount(),
+ type,
+ MallUtils.getOrderNum(),
+ flowType,
+ String.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ 2
+ );
}
}
--
Gitblit v1.9.1