From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 85fa7e8..addd16c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -37,6 +37,7 @@
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
 import com.yeshi.fanli.util.rocketmq.MQTopicName;
 
 import net.sf.json.JSONArray;
@@ -603,13 +604,9 @@
 	private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {
 		// 閭�璇锋秷鎭�
 		UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
-		if (activeLog != null) {
-			if (VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
-					activeLog.getVersionCode())) { // 2.0.2鐗堟湰浠ヤ笂
-				userInviteMsgNotificationService.inviteSuccess2_0_2(bossId, threeSale);
-			} else { // 鏈�鍒濇秷鎭�
-				userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
-			}
+		if (activeLog != null && VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+				activeLog.getVersionCode())) { // 2.1鐗堟湰浠ヤ笂
+			userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale);
 		} else { // 鏈�鍒濇秷鎭�
 			userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
 		}
@@ -622,8 +619,8 @@
 			}
 		});
 		UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
-		Message message = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.inviteSuccess.name(),
-				new Gson().toJson(msg).getBytes());
+		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess,
+				msg);
 		producer.send(message);
 	}
 

--
Gitblit v1.8.0