From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 1512025..ac99c59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;
+import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
@@ -90,14 +91,57 @@
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
if (StringUtil.isNullOrEmpty(relationId))
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
- userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, true);
- } else {
+ try {
+ userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid,nickName, true);
+ } catch (UserExtraTaoBaoInfoException e) {
+ LogHelper.test(e.getMsg());
+ errCode = 5;
+ }
+ } else if ("zigou".equalsIgnoreCase(source)) {
String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
- userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, true);
+ try {
+ userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, nickName, true);
+ } catch (UserExtraTaoBaoInfoException e) {
+ LogHelper.test(e.getMsg());
+ errCode = 5;
+ }
+ } else if ("bind".equalsIgnoreCase(source)) {
+
+ boolean bindInfo = true;
+ // 缁戝畾娣樺疂锛歏1.5.3
+ String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ if (StringUtil.isNullOrEmpty(relationId)) {
+ LogHelper.test(uid + "娓犻亾澶囨澶辫触");
+ bindInfo = false;
+ }
+
+ String specialId = null;
+ if(bindInfo) {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ if (StringUtil.isNullOrEmpty(specialId)) {
+ LogHelper.test(uid + "浼氬憳澶囨澶辫触");
+ bindInfo = false;
+ }
+ }
+
+ if (!bindInfo) {
+ errCode = 5;// 淇℃伅鑾峰彇涓嶅叏
+ } else {
+ try {
+ userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName, true);
+ } catch (UserExtraTaoBaoInfoException e) {
+ LogHelper.test(e.getMsg());
+ errCode = 6;
+ }
+ }
+
}
+
if (!StringUtil.isNullOrEmpty(nickName))
try {
@@ -112,6 +156,7 @@
record.setTaoBaoUserNick(nickName);
record.setCreateTime(new Date());
taoBaoUnionAuthRecordService.addAuthRecord(record);
+
} catch (Exception e) {
errCode = 4;
try {
@@ -124,15 +169,21 @@
try {
if (errCode == 0)// 鎴愬姛
{
- if ("share".equalsIgnoreCase(source))
+ if ("share".equalsIgnoreCase(source)) {
response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
- else
+ } else if ("zigou".equalsIgnoreCase(source)) {
response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+ } else if ("bind".equalsIgnoreCase(source)) {
+ response.getWriter().print("<script>yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();</script>");
+ }
} else {// 澶辫触
- if ("share".equalsIgnoreCase(source))
+ if ("share".equalsIgnoreCase(source)) {
response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
- else
+ } else if ("zigou".equalsIgnoreCase(source)) {
response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+ } else if ("bind".equalsIgnoreCase(source)) {
+ response.getWriter().print("<script>yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();</script>");
+ }
}
} catch (Exception e) {
--
Gitblit v1.8.0