From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
index 2d60100..09d35b4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
@@ -20,18 +20,18 @@
import com.yeshi.fanli.dto.mq.user.body.UserForbiddenMQMsg;
import com.yeshi.fanli.dto.order.UserTeamLevel;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.ParamsException;
import com.yeshi.fanli.exception.money.TeamDividentsDebtException;
import com.yeshi.fanli.exception.order.dividents.TeamDividentsSourceOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
-import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsSourceManager;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.order.CommonOrderUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -42,9 +42,6 @@
*/
@Component
public class OrderDividentsMessageListener implements MessageListener {
-
- @Resource
- private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
@Resource
private CommonOrderService commonOrderService;
@@ -59,7 +56,7 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private TeamUserLevelStatisticService teamUserLevelStatisticService;
+ private UserLevelManager userLevelManager;
public OrderDividentsMessageListener() {
@@ -76,13 +73,20 @@
// 鏌ヨ涓婄骇绾㈠寘
UserForbiddenMQMsg dto = new Gson().fromJson(new String(message.getBody()), UserForbiddenMQMsg.class);
if (dto != null) {
- teamDividentsSourceOrderService.invalidOrderByUid(dto.getUid(), "鐢ㄦ埛琚皝绂�");
+ teamDividentsSourceManager.invalidBySourceUid(dto.getUid(), "鐢ㄦ埛琚皝绂�");
return Action.CommitMessage;
}
}
} else if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {
+
OrderMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
+ if (dto == null || dto.getStaticticDate().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ return Action.CommitMessage;
+
+ if (dto.isMiandan())// 鍏嶅崟鐨勫晢鍝佷笉鍙備笌鍒嗙孩
+ return Action.CommitMessage;
+
if (dto.getHandleType() == OrderMQMsg.HANDLE_TYPE_ADD) {
List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(dto.getType(),
dto.getOrderId());
@@ -93,13 +97,8 @@
List<ThreeSale> threeSalesList = threeSaleSerivce.getMyBossDeepList(dto.getUid(), 100);
if (threeSalesList != null)
for (ThreeSale ts : threeSalesList) {
- TeamUserLevelStatistic levelStatistic = teamUserLevelStatisticService
- .selectByUid(ts.getBoss().getId());
- if (levelStatistic == null) {
- teamUserLevelStatisticService.initData(ts.getBoss().getId());
- levelStatistic = teamUserLevelStatisticService.selectByUid(ts.getBoss().getId());
- }
- bossList.add(new UserTeamLevel(ts.getBoss().getId(), levelStatistic.getLevel()));
+ UserLevelEnum level = userLevelManager.getUserLevel(ts.getBoss().getId());
+ bossList.add(new UserTeamLevel(ts.getBoss().getId(), level));
}
try {
teamDividentsSourceManager.addSource(commonOrderList, bossList);
@@ -117,7 +116,6 @@
}
} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {// 璁㈠崟纭鏀惰揣
- // 鎻掑叆鍒嗙孩
OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);
teamDividentsSourceManager.orderSettle(dto.getOrderNo(), dto.getSourceType());
} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.taoBaoOrderWeiQuan.name())) {
--
Gitblit v1.8.0