From 610211fb6ca69e66276ccf99c30f1814e4e2bc4a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 14:46:40 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java | 2 +-
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 3 +--
src/test/java/cc/mrbird/febs/AgentTest.java | 6 +++++-
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 12 ++++++++----
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
index 9f477f0..50797b6 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/RabbitConfigure.java
@@ -119,7 +119,7 @@
@Bean
public Binding orderReturnMoneyBind() {
- return BindingBuilder.bind(agentReturnMoneyQueue()).to(agentReturnMoneyExchange()).with(RabbitQueueEnum.ORDER_RETURN_MONEY.getRoute());
+ return BindingBuilder.bind(orderReturnMoneyQueue()).to(orderReturnMoneyExchange()).with(RabbitQueueEnum.ORDER_RETURN_MONEY.getRoute());
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 7fab9d0..d9ca15a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -134,22 +134,26 @@
continue;
}
+ if (direct.compareTo(BigDecimal.ONE) < 1) {
+ break;
+ }
+
int reduce = walletService.reduce(direct, parentMember.getId(), "score");
if (reduce == 2) {
continue;
}
walletService.add(direct, parentMember.getId(), "commission");
-
moneyFlowService.addMoneyFlow(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue());
moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
- if (direct.compareTo(BigDecimal.ONE) < 1) {
- break;
- }
direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP);
}
+ if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
+
int reduce = walletService.reduce(dynamicProfit, member.getId(), "score");
if (reduce == 2) {
continue;
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index cdadcb4..46c50a1 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -66,11 +66,10 @@
@RabbitListener(queues = QueueConstants.ORDER_RETURN_MONEY)
public void orderReturnMoney(String orderId) {
log.info("收到订单返利消息:{}", orderId);
-
try {
memberProfitService.dynamicProfit(Long.parseLong(orderId));
} catch (Exception e) {
- log.error("订单返利异常:{}", e);
+ log.error("订单返利异常:", e);
}
}
}
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index a25e932..c1bface 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.mall.service.IAgentService;
import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo;
import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo;
+import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -617,8 +618,11 @@
}
+ @Autowired
+ private AgentConsumer agentConsumer;
+
@Test
public void orderReturnTest() {
- agentProducer.sendOrderReturn(1L);
+ agentConsumer.orderReturnMoney("1");
}
}
--
Gitblit v1.9.1