From db751b1fda37f52134cdc1730a4037138b7f3550 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 四月 2020 10:02:19 +0800
Subject: [PATCH] 升级消息

---
 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 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..4a126e9 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,16 +10,18 @@
 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;
 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.rocketmq.MQTopicName;
 
 /**
@@ -39,6 +41,9 @@
 
 	@Resource
 	private ThreeSaleSerivce threeSaleSerivce;
+	
+	@Resource
+	private UserInviteValidNumService userInviteValidNumService;
 
 	@Override
 	public Action consume(Message message, ConsumeContext context) {
@@ -49,14 +54,13 @@
 		if (tag == null)
 			tag = "";
 
+		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.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,13 +93,20 @@
 						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());
+					userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(), dto.getPlaceOrderTime());
+				}
 			}
 		}
 

--
Gitblit v1.8.0