From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 3ed20c7..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;
@@ -56,7 +56,7 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private TeamUserLevelStatisticService teamUserLevelStatisticService;
+ private UserLevelManager userLevelManager;
public OrderDividentsMessageListener() {
@@ -79,7 +79,14 @@
}
} 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());
@@ -90,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);
@@ -114,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