From a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 06 五月 2020 14:04:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 d417165..8f65c19 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
@@ -15,13 +15,16 @@
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
import com.yeshi.fanli.dto.mq.user.body.ThreeSaleSeparateMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.log.LogHelper;
+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.TeamUserLevelStatisticService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
/**
@@ -41,9 +44,12 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserInviteValidNumService userInviteValidNumService;
+
+ @Resource
+ private UserActiveLogService userActiveLogService;
@Override
public Action consume(Message message, ConsumeContext context) {
@@ -57,12 +63,18 @@
if (java.lang.System.currentTimeMillis() <= Constant.NEW_ORDER_FANLI_RULE_TIME) {
return Action.CommitMessage;
}
-
+
// 閭�璇风浉鍏�
if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {
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());
@@ -77,6 +89,7 @@
} 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());
@@ -92,6 +105,18 @@
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());
+
+ if (log == null || !VersionUtil.greaterThan_2_1(
+ "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) {
+ return Action.CommitMessage;
+ }
+
if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 鑷喘鍒拌处
// 浼氬憳鍗囩骇-鑷喘璁㈠崟鏁伴噺楠岃瘉
userVIPPreInfoService.upgradeVipByMyOrder(dto.getUid());
@@ -101,11 +126,17 @@
}
}
} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {
- OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()),OrderConfirmMQMsg.class);
+ 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(), dto.getPlaceOrderTime());
+ userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(),
+ dto.getPlaceOrderTime());
}
}
}
--
Gitblit v1.8.0