From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java b/fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java
index 2d8a451..7e057ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java
@@ -2,23 +2,33 @@
 
 import com.yeshi.fanli.dto.mq.user.body.IntegralTaskMQMsg;
 import com.yeshi.fanli.dto.mq.user.body.InterTokenMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.InviteCodeActiveMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.ThreeSaleSeparateMQMsg;
 import com.yeshi.fanli.dto.mq.user.body.UserAccountBindingMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserForbiddenMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserInfoUpdateMQMsg;
 import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg;
 import com.yeshi.fanli.dto.mq.user.body.UserRedPackGiftMQMsg;
 import com.yeshi.fanli.dto.mq.user.body.UserRegisterMQMsg;
+import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;
 import com.yeshi.fanli.util.annotation.UserActive;
 
 public enum UserTopicTagEnum {
 	userAccountBinding(UserAccountBindingMQMsg.class), // 鐢ㄦ埛璐﹀彿缁戝畾
 	userActve(UserActive.class), // 鐢ㄦ埛娲昏穬
-	useSystemCoupon(UserActive.class), // 绯荤粺鍒镐娇鐢�
+	useSystemCoupon(UserSystemCouponUseMQMsg.class), // 绯荤粺鍒镐娇鐢�
+	systemCouponDrawback(UserSystemCouponUseMQMsg.class), // 绯荤粺鍒搁��鍥�
 	inviteSuccess(UserInviteMQMsg.class), // 閭�璇锋垚鍔�
 	integralTaskFinish(IntegralTaskMQMsg.class), // 瀹屾垚閲戝竵浠诲姟
-	userRegister(UserRegisterMQMsg.class),
-	tokenOutOfDate(InterTokenMQMsg.class),
-	redPackGift(UserRedPackGiftMQMsg.class);// 绾㈠寘璧犻��
-
-	// 鐢ㄦ埛娉ㄥ唽
+	userRegister(UserRegisterMQMsg.class), // 娉ㄥ唽
+	tokenOutOfDate(InterTokenMQMsg.class), // 鍙d护杩囨湡
+	redPackGiftDrawback(UserRedPackGiftMQMsg.class), // 绾㈠寘璧犻�侀��鍥�
+	inviteCodeActive(InviteCodeActiveMQMsg.class), // 閭�璇风爜婵�娲�
+	forbiddenUser(UserForbiddenMQMsg.class), // 灏佺鐢ㄦ埛
+	userInfoUpdate(UserInfoUpdateMQMsg.class), // 鐢ㄦ埛淇℃伅淇敼
+	userLevelChanged(UserLevelChangedMQMsg.class), // 鐢ㄦ埛绛夌骇鍙樺寲
+	threeSaleSeparate(ThreeSaleSeparateMQMsg.class);// 閭�璇峰叧绯昏劚绂�
 
 	private final Class<?> clazz;
 

--
Gitblit v1.8.0