From 6cb04a3c75f46001a55be402c6650d5600748dc7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 21:50:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java
index 9952a2a..ccd3e44 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java
@@ -8,7 +8,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
 import com.yeshi.fanli.dao.mybatis.user.UserExtraTaoBaoInfoMapper;
+import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
+import com.yeshi.fanli.dto.mq.user.body.TaoBaoBindSuccessMQMsg;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
 import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;
@@ -20,6 +24,8 @@
 import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
 
 @Service
 public class UserExtraTaoBaoInfoServiceImpl implements UserExtraTaoBaoInfoService {
@@ -33,7 +39,10 @@
 	@Resource
 	private UserAccountBindingHistoryService userAccountBindingHistoryService;
 
-	@Transactional(rollbackFor=Exception.class)
+	@Resource(name = "producer")
+	private Producer producer;
+
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void addRelationId(Long uid, String relationId, String taoBaoUid, String nickName, boolean valid)
 			throws UserExtraTaoBaoInfoException {
@@ -77,7 +86,7 @@
 		}
 	}
 
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void addSpecialId(Long uid, String specialId, String taoBaoUid, String nickName, boolean valid)
 			throws UserExtraTaoBaoInfoException {
@@ -121,7 +130,7 @@
 		}
 	}
 
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void saveUserTaoBaoInfo(Long uid, String relationId, String specialId, String taoBaoUid, String nickName,
 			boolean valid) throws UserExtraTaoBaoInfoException {
@@ -156,12 +165,15 @@
 
 		// 娓呴櫎涔嬪墠鐨勭敤鎴稩D
 		userExtraTaoBaoInfoMapper.clearUid(uid);
+		Long fromUid = null;
 
 		if (list == null || list.size() == 0) {
 			// 鏂板
 			taoBaoInfo.setCreateTime(new Date());
 			userExtraTaoBaoInfoMapper.insertSelective(taoBaoInfo);
 		} else {
+			if (list.get(0).getUser() != null)
+				fromUid = list.get(0).getUser().getId();
 			// 鍙栫涓�涓浛鎹id 绛変俊鎭�
 			taoBaoInfo.setId(list.get(0).getId());
 			taoBaoInfo.setUpdateTime(new Date());
@@ -187,6 +199,10 @@
 		else
 			history.setFirst(true);
 		userAccountBindingHistoryService.addUserAccountBindingHistory(history);
+
+		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.taobaoBindSuccess,
+				new TaoBaoBindSuccessMQMsg(uid, fromUid, taoBaoUid, new Date()));
+		producer.send(message);
 	}
 
 	/**

--
Gitblit v1.8.0