From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java |   77 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 39 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 a523b45..757dd2b 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
@@ -13,7 +13,6 @@
 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.UserInviteMQMsg;
-import com.yeshi.fanli.exception.money.OrderMoneySettleException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
 import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -24,46 +23,46 @@
  * @author Administrator
  *
  */
-//@Component implements MessageListener
-public class UserVIPMessageListener  {
+@Component 
+public class UserVIPMessageListener implements MessageListener {
 
 	@Resource
 	private UserVIPPreInfoService userVIPPreInfoService;
 
-//	@Override
-//	public Action consume(Message message, ConsumeContext context) {
-//		
-//		LogHelper.mqInfo("consumer-UserVIPMessageListener", message.getMsgID(), message.getTopic(),
-//				message.getTag(), new String(message.getBody()));
-//		String tag = message.getTag();
-//		if (tag == null)
-//			tag = "";
-//
-//		// 閭�璇风浉鍏�
-//		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);
-//			}
-//		}
-//		
-//		// 璁㈠崟鍒拌处鐩稿叧
-//		if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name())) {
-//			OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(message.getBody()),
-//					OrderMoneyRecievedMQMsg.class);
-//			if (dto != null) {
-//				if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 鑷喘鍒拌处
-//					// 浼氬憳绛夌骇鍗囩骇
-//					userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
-//				} else if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {// 鍒嗕韩鍒拌处
-//					// 浼氬憳绛夌骇鍗囩骇
-//					userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
-//				}
-//			}
-//		}
-//		
-//		return Action.CommitMessage;
-//	}
+	@Override
+	public Action consume(Message message, ConsumeContext context) {
+		
+		LogHelper.mqInfo("consumer-UserVIPMessageListener", message.getMsgID(), message.getTopic(),
+				message.getTag(), new String(message.getBody()));
+		String tag = message.getTag();
+		if (tag == null)
+			tag = "";
+
+		// 閭�璇风浉鍏�
+		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);
+			}
+		}
+		
+		// 璁㈠崟鍒拌处鐩稿叧
+		if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name())) {
+			OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(message.getBody()),
+					OrderMoneyRecievedMQMsg.class);
+			if (dto != null) {
+				if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 鑷喘鍒拌处
+					// 浼氬憳绛夌骇鍗囩骇
+					userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
+				} else if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {// 鍒嗕韩鍒拌处
+					// 浼氬憳绛夌骇鍗囩骇
+					userVIPPreInfoService.verifyVipPreInfo(dto.getUid(), false);
+				}
+			}
+		}
+		
+		return Action.CommitMessage;
+	}
 }

--
Gitblit v1.8.0