From 712fb305d6f79961e879a2f543107e19d7f9e8a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 11 五月 2020 10:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java
index b0652a6..ef8190b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
+import com.yeshi.fanli.service.inter.user.vip.TeamLevelDailyRecordService;
import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.Constant;
@@ -50,6 +51,10 @@
@Resource
private UserActiveLogService userActiveLogService;
+
+ @Resource
+ private TeamLevelDailyRecordService teamLevelDailyRecordService;
+
@Override
public Action consume(Message message, ConsumeContext context) {
@@ -69,6 +74,12 @@
if (tag.equalsIgnoreCase(UserTopicTagEnum.userLevelChanged.name())) {// 鐢ㄦ埛绛夌骇鍙戠敓鍙樺寲
UserLevelChangedMQMsg msg = new Gson().fromJson(new String(message.getBody()),
UserLevelChangedMQMsg.class);
+
+ for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 绂佹涓嶈兘鍗囩骇鐨勭敤鎴峰崌绾�
+ if (msg.getUid().longValue() == fuid)
+ return Action.CommitMessage;
+ }
+
// 鏇存柊涓�2绾х殑閭�璇风粺璁�
teamUserLevelStatisticService.updateUserLevel(msg.getUid());
UserInfo boss = threeSaleSerivce.getBoss(msg.getUid());
@@ -78,11 +89,15 @@
if (boss != null) {
teamUserLevelStatisticService.initData(boss.getId());
}
+
+ // 閲嶆柊缁熻绮変笣绛夌骇鏁伴噺
+ teamLevelDailyRecordService.addStatisticByUid(boss.getId());
}
return Action.CommitMessage;
} else if (tag.equalsIgnoreCase(UserTopicTagEnum.threeSaleSeparate.name())) {// 閭�璇峰叧绯昏劚绂�
ThreeSaleSeparateMQMsg msg = new Gson().fromJson(new String(message.getBody()),
ThreeSaleSeparateMQMsg.class);
+
// 鏇存柊涓婁袱绾ч個璇风粺璁�
teamUserLevelStatisticService.initData(msg.getBossUid());
UserInfo boss = threeSaleSerivce.getBoss(msg.getBossUid());
@@ -98,6 +113,10 @@
OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(message.getBody()),
OrderMoneyRecievedMQMsg.class);
if (dto != null) {
+ for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 绂佹涓嶈兘鍗囩骇鐨勭敤鎴峰崌绾�
+ if (dto.getUid().longValue() == fuid)
+ return Action.CommitMessage;
+ }
// 鍒ゆ柇鐗堟湰
UserActiveLog log = userActiveLogService.getUserLatestActiveInfo(dto.getUid());
@@ -117,6 +136,11 @@
} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {
OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);
if (dto != null) {
+ for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 绂佹涓嶈兘鍗囩骇鐨勭敤鎴峰崌绾�
+ if (dto.getSourceUid().longValue() == fuid)
+ return Action.CommitMessage;
+ }
+
// 浼氬憳绛夌骇鍗囩骇-绮変笣鏁伴噺楠岃瘉
userVIPPreInfoService.upgradeVipByTeamNum(dto.getSourceUid());
userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(),
--
Gitblit v1.8.0