From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index ebad0b6..639b375 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -878,27 +878,30 @@
 		}
 		
 		// 娣樺疂鏄电О 缁勭粐
-		boolean clearTbName = true;
+		boolean clearOpenid = true;
 		UserExtraTaoBaoInfo extraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
 		if (extraTaoBaoInfo != null) {
 			String specialId = extraTaoBaoInfo.getSpecialId();
 			String relationId = extraTaoBaoInfo.getRelationId();
 			String taoBaoNickName = extraTaoBaoInfo.getTaoBaoNickName();
+			
 			if(!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
+				clearOpenid = false;
+				userInfo.setOpenid(extraTaoBaoInfo.getTaoBaoUid());
+				
 				if(!StringUtil.isNullOrEmpty(taoBaoNickName)) {
 					userInfo.setTbName(taoBaoNickName);
-					clearTbName = false;
 				} else {
 					String taoBaoUserNick = taoBaoUnionAuthRecordService.getTaoBaoUserNick(uid);
 					if(!StringUtil.isNullOrEmpty(taoBaoUserNick)) {
 						userInfo.setTbName(taoBaoUserNick);
-						clearTbName = false;
 					}
 				}
 			}
 		}
-		if (clearTbName) {
-			userInfo.setTbName(null);
+		
+		if (clearOpenid) {
+			userInfo.setOpenid(null);
 		}
 		
 		return userInfo;

--
Gitblit v1.8.0