From df03194e4b0c0737cf84127c4dd69d456e30ed24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:24:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
index eb6698f..82f7e9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -80,14 +80,21 @@
String openUid = data.optString("taobao_open_uid");
String taoBaoUid = data.optString("taobao_user_id");
String nickName = data.optString("taobao_user_nick");
+
+ // LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
+
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
Constant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ if (StringUtil.isNullOrEmpty(relationId))
+ LogHelper.test(uid + "娓犻亾澶囨澶辫触");
userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, true);
} else {
String specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
Constant.TAOBAO_AUTH_APPSECRET);
+ if (StringUtil.isNullOrEmpty(specialId))
+ LogHelper.test(uid + "浼氬憳澶囨澶辫触");
userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, true);
}
@@ -106,6 +113,11 @@
taoBaoUnionAuthRecordService.addAuthRecord(record);
} catch (Exception e) {
errCode = 4;
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
try {
--
Gitblit v1.8.0