From b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 22 九月 2019 16:47:33 +0800
Subject: [PATCH] 金币BUG修改
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 31 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 10fd233..a979f21 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Date;
@@ -12,18 +13,25 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;
+import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;
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;
+import com.yeshi.fanli.service.inter.user.UserActiveLogService;
+import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
+import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -45,7 +53,16 @@
private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;
@Resource
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
+
+ @Resource
+ private UserInfoModifyRecordService userInfoModifyRecordService;
+
+ @Resource
private RedisManager redisManager;
+
+ @Resource
+ private UserActiveLogService userActiveLogService;
@RequestMapping(value = "tb")
public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {
@@ -101,12 +118,20 @@
} catch (Exception e) {
}
final String name = nickName;
- // LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
+ LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
- String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = null;
+
+ try {
+ relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ } catch (TaoBaoAuthException e) {
+ if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
+
if (StringUtil.isNullOrEmpty(relationId))
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
try {
@@ -115,27 +140,46 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
+
+ final String relationId2 = relationId;
// 寮傛鐢宠浼氬憳ID
ThreadUtil.run(new Runnable() {
@Override
public void run() {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ String specialId = null;
+ try {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e1) {
+
+ }
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
try {
userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, name, true);
+
+ if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
}
}
});
+ // 绋嶄綔寤惰繜
+ Thread.sleep(50);
} else if ("zigou".equalsIgnoreCase(source)) {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ String specialId = null;
+
+ try {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e) {
+ if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
@@ -146,29 +190,47 @@
errCode = 5;
}
+ final String specialId2 = specialId;
// 寮傛鐢宠娓犻亾ID
ThreadUtil.run(new Runnable() {
@Override
public void run() {
- String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = null;
+ try {
+ relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e1) {
+ } // 娓犻亾ID
if (StringUtil.isNullOrEmpty(relationId))
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
try {
userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, name, true);
+
+ if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
}
}
});
+ // 绋嶄綔寤惰繜
+ Thread.sleep(50);
} 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
+ String relationId = null;
+
+ int tbErrorCode = 0;
+ try {
+ relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ } catch (TaoBaoAuthException e) {
+ tbErrorCode = e.getCode();
+ }
+
if (StringUtil.isNullOrEmpty(relationId)) {
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
bindInfo = false;
@@ -176,8 +238,12 @@
String specialId = null;
if (bindInfo) {
- specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ try {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e) {
+ tbErrorCode = e.getCode();
+ }
if (StringUtil.isNullOrEmpty(specialId)) {
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
bindInfo = false;
@@ -185,11 +251,17 @@
}
if (!bindInfo) {
+ if (tbErrorCode == TaoBaoAuthException.CODE_NOT_REAL_NAME) {
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
errCode = 5;// 淇℃伅鑾峰彇涓嶅叏
} else {
try {
userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName,
true);
+
+ if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId))
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
errCode = 6;
@@ -214,10 +286,22 @@
} catch (Exception e) {
errCode = 4;
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(uid);
+
+ boolean isNewJump = false;
+ if (activeLog != null) {
+ String platform = null;
+ String version = activeLog.getVersionCode();
+ if (activeLog.getChannel().equalsIgnoreCase("appstore")) {
+ platform = "ios";
+ } else {
+ platform = "android";
+ }
+ if (VersionUtil.greaterThan_2_0(platform, version)) {
+ isNewJump = true;
}
}
@@ -225,25 +309,45 @@
if (errCode == 0)// 鎴愬姛
{
if ("share".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
- String script = String.format(
- "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
- StringUtil.getBase64String("鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛"));
- response.getWriter().print(script);
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else {
+ String script = String.format(
+ "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
+ StringUtil.getBase64String("鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛"));
+ response.getWriter().print(script);
+ }
}
} else {// 澶辫触
if ("share".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
- String script = String.format(
- "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
- StringUtil.getBase64String("鎶辨瓑锛屾窐瀹濈粦瀹氬け璐�"));
- response.getWriter().print(script);
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else {
+ String script = String.format(
+ "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
+ StringUtil.getBase64String("鎶辨瓑锛屾窐瀹濈粦瀹氬け璐�"));
+ response.getWriter().print(script);
+ }
}
}
} catch (Exception e) {
@@ -252,6 +356,11 @@
}
+ private void closeWebPage(PrintWriter out) {
+ String script = "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.finishPage();}</script>";
+ out.print(script);
+ }
+
@RequestMapping(value = "pinduoduo")
public void pinDuoDuo(HttpServletResponse response) {
--
Gitblit v1.8.0