From f150c96d9227c1cea6feef6b78f315b8be8410d0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 15:32:20 +0800
Subject: [PATCH] refactor(mall): 重构提现相关逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java | 3 +--
src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 4 +++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java b/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
index 0062440..3977aec 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
@@ -19,7 +19,7 @@
@NotNull(message = "参数不能为空")
@Min(0)
- @ApiModelProperty(value = "金额", example = "1")
+ @ApiModelProperty(value = "碳积分", example = "1")
private BigDecimal amount;
@NotBlank(message = "参数不能为空")
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
index 702e470..40ef332 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
@@ -24,6 +24,8 @@
private BigDecimal amountFee;
+ private BigDecimal withdrawTimes;
+
private String name;
private String type;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
index 54cff7b..99cd469 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
@@ -111,8 +111,7 @@
mallMoneyFlow.setStatus(mallMemberWithdraw.getStatus());
mallMoneyFlowMapper.updateById(mallMoneyFlow);
if(mallMemberWithdraw.getStatus() == YesOrNoEnum.NO.getValue()){
- BigDecimal add = mallMemberWithdraw.getAmount().add(mallMemberWithdraw.getAmountFee());
- walletService.addBalance(add, mallMemberWithdraw.getMemberId());
+ walletService.addBalance(mallMemberWithdraw.getWithdrawTimes(), mallMemberWithdraw.getMemberId());
}
return new FebsResponse().success().message("操作成功");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 447cefe..d28342a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -583,6 +583,8 @@
/**
* 减少碳币，增加进行中提现记录
*/
+ walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
+
BigDecimal withdrawalAmount = withdrawalDto.getAmount().multiply(balanceToCoin).setScale(2, BigDecimal.ROUND_DOWN);
BigDecimal fee = balanceToCoinPercent.multiply(withdrawalAmount).setScale(2, BigDecimal.ROUND_DOWN);
BigDecimal withdrawalAmountReal = withdrawalAmount.subtract(fee);
@@ -595,9 +597,9 @@
withdraw.setAmountFee(fee);
withdraw.setName(mallMemberPayment.getBank());
withdraw.setType(mallMemberPayment.getBankNo());
+ withdraw.setWithdrawTimes(withdrawalDto.getAmount());
mallMemberWithdrawMapper.insert(withdraw);
- walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
this.runVipMoneyFlowAdd(
loginMember.getId(),
loginMember.getId(),
--
Gitblit v1.9.1