From 2022467b27d6c5a4c98323a84091e57b350af93d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Sep 2021 19:57:52 +0800
Subject: [PATCH] fix reutrn money
---
src/test/java/cc/mrbird/febs/AgentTest.java | 3 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 12 ++++++------
sql/xc_mall.sql | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index 19039be..e715e06 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -372,4 +372,4 @@
) COMMENT = '新闻中心';
alter table mall_money_flow add is_return int null comment '是否返利';
-
+alter table mall_member_wallet modify balance decimal(20,2) not null comment '余额';
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 61bcc1e..be30735 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -215,13 +215,13 @@
amount.put(mallMember.getId(), returnMoney);
} else {
if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
- amount.put(mallMember.getId(), BigDecimal.ONE);
+ // 代理两级
+ if (amount.size() >= 2) {
+ continue;
+ } else {
+ amount.put(mallMember.getId(), BigDecimal.ONE);
+ }
}
- }
-
- // 代理两级
- if (amount.size() > 2) {
- continue;
}
needReturn.put(level, amount);
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 6f4bc41..e7f6919 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -109,7 +109,8 @@
public void returnMoney() {
// agentService.autoUpAgentLevel(3L);
// agentProducer.sendAutoLevelUpMsg(5L);
- agentService.returnMoneyToAgent(32L);
+// agentProducer.sendReturnMoneyMsg(52L);
+ agentService.returnMoneyToAgent(52L);
}
@Test
--
Gitblit v1.9.1