From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 a804fa1..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,7 +20,7 @@
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;
@@ -28,9 +28,9 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
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() {
@@ -97,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);
--
Gitblit v1.8.0