From f5beeeda5c8cad4ef29a4a875d5a05543657f1eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 13 Apr 2023 10:57:17 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java | 3 +++
src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 12 +++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java
index 619c073..1ce5998 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java
@@ -13,6 +13,9 @@
@ApiModelProperty(value = "1:普通充值 2：合伙人充值", example = "10")
private Integer type;
+ @ApiModelProperty(value = "代理申请ID", example = "10")
+ private Long agentApplyId;
+
@ApiModelProperty(value = "充值金额", example = "10")
private BigDecimal amount;
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java b/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
index e061e25..f4583b0 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
@@ -27,6 +27,10 @@
private String area;
//详细地址
private String storeAddress;
+ //充值金额
+ private BigDecimal amount;
+ //代理等级
+ private Integer agentLevel;
//状态 1：:申请中 2：同意 3：拒绝
private Integer state;
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 9ffdf23..e42a80e 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
@@ -748,11 +748,13 @@
Integer type = apiRechargeWalletDto.getType();
if(2 == type){
//成为合伙人的充值金额
- DataDictionaryCustom agentPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType(),
- DataDictionaryEnum.PRICE_AMOUNT.getCode());
- String agentPrice = agentPriceDic.getValue();
- BigDecimal price = new BigDecimal(agentPrice);
- if(price.compareTo(amount) != 0){
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(apiRechargeWalletDto.getAgentApplyId());
+ BigDecimal agentPrice = mallAgentRecord.getAmount();
+// DataDictionaryCustom agentPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType(),
+// DataDictionaryEnum.PRICE_AMOUNT.getCode());
+// String agentPrice = agentPriceDic.getValue();
+// BigDecimal price = new BigDecimal(agentPrice);
+ if(agentPrice.compareTo(amount) != 0){
return new FebsResponse().fail().message("成为合伙人的金额为"+agentPrice);
}
}
--
Gitblit v1.9.1