From 3d92fcd729376c584a07d5f23b8e06f81fbcbcde Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:12: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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 2ac2b8a..f22faf7 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
@@ -10,10 +10,10 @@
import com.aliyun.openservices.ons.api.MessageListener;
import com.google.gson.Gson;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
+import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
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.UserInviteMQMsg;
import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.log.LogHelper;
@@ -51,12 +51,7 @@
// 閭�璇风浉鍏�
if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {
- // 閭�璇锋垚鍔�
- if (tag.equalsIgnoreCase(UserTopicTagEnum.inviteSuccess.name())) {
- UserInviteMQMsg msg = new Gson().fromJson(new String(message.getBody()), UserInviteMQMsg.class);
- // 浼氬憳绛夌骇鍗囩骇
- userVIPPreInfoService.verifyVipPreInfo(msg.getBossId(), true);
- } else if (tag.equalsIgnoreCase(UserTopicTagEnum.userLevelChanged.name())) {// 鐢ㄦ埛绛夌骇鍙戠敓鍙樺寲
+ if (tag.equalsIgnoreCase(UserTopicTagEnum.userLevelChanged.name())) {// 鐢ㄦ埛绛夌骇鍙戠敓鍙樺寲
UserLevelChangedMQMsg msg = new Gson().fromJson(new String(message.getBody()),
UserLevelChangedMQMsg.class);
// 鏇存柊涓�2绾х殑閭�璇风粺璁�
@@ -89,12 +84,18 @@
OrderMoneyRecievedMQMsg.class);
if (dto != null) {
if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 鑷喘鍒拌处
- // 浼氬憳绛夌骇鍗囩骇
- userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
+ // 浼氬憳鍗囩骇-鑷喘璁㈠崟鏁伴噺楠岃瘉
+ userVIPPreInfoService.upgradeVipByFanLiOrder(dto.getUid());
} else if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {// 鍒嗕韩鍒拌处
- // 浼氬憳绛夌骇鍗囩骇
- userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
- }
+ // 浼氬憳鍗囩骇-鍒嗕韩璁㈠崟鏁伴噺楠岃瘉
+ userVIPPreInfoService.upgradeVipByShareOrder(dto.getUid());
+ }
+ }
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {
+ OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()),OrderConfirmMQMsg.class);
+ if (dto != null) {
+ // 浼氬憳绛夌骇鍗囩骇-绮変笣鏁伴噺楠岃瘉
+ userVIPPreInfoService.upgradeVipByTeamNum(dto.getSourceUid());
}
}
}
--
Gitblit v1.8.0