From 1da17d215d48e3e3aa9e8d7a3ef526904764f408 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期一, 08 四月 2019 14:06:12 +0800 Subject: [PATCH] 1.5.3部分需求 提交 --- fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java | 75 ++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java index e79e280..1f3650f 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java @@ -14,7 +14,6 @@ import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; -import com.yeshi.fanli.util.AESUtil; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -83,7 +82,75 @@ } String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(Constant.TAOBAO_AUTH_APPKEY, - "http://test.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source); + "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source); + + String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');"; + orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}"; + JSONObject data = new JSONObject(); + data.put("authLink", link); + try { + data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"), + StringUtil.getBase64String("*M#34f?,"))); + } catch (Exception e) { + e.printStackTrace(); + } + + data.put("orderUrl", "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm"); + if (first) + out.print(JsonUtil.loadTrueResult(data)); + else + out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�")); + } + + + /** + * 鑾峰彇娣樺疂鎺堟潈淇℃伅 + * + * @param acceptData + * @param uid + * @param source + * @param out + */ + @RequestMapping(value = "getTaoBaoAuthInfoNew", method = RequestMethod.POST) + public void getTaoBaoAuthInfoNew(AcceptData acceptData, Long uid, String source, Boolean first, PrintWriter out) { + + if (uid == null) { + out.print(JsonUtil.loadFalseResult(2, "鐢ㄦ埛鏈櫥褰�")); + return; + } + + if (StringUtil.isNullOrEmpty(source)) { + out.print(JsonUtil.loadFalseResult(3, "鏉ユ簮閿欒")); + return; + } + + if (first == null) { + out.print(JsonUtil.loadFalseResult(4, "璇蜂紶first")); + return; + } + + if (!"1".equalsIgnoreCase(configService.get("open_speical_and_relation_apply"))) { + out.print(JsonUtil.loadFalseResult(1, "鏆備笉寮�鏀剧敵璇�")); + return; + } + + // + UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid); + if ("share".equalsIgnoreCase(source)) { + if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) { + out.print(JsonUtil.loadFalseResult(1, "鏃犻渶鎺堟潈")); + return; + } + + } else if ("zigou".equalsIgnoreCase(source)) { + if (user != null && !StringUtil.isNullOrEmpty(user.getSpecialId()) && user.getSpecialValid()) { + out.print(JsonUtil.loadFalseResult(1, "鏃犻渶鎺堟潈")); + return; + } + } + + String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(Constant.TAOBAO_AUTH_APPKEY, + "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source); String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');"; orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}"; @@ -103,3 +170,7 @@ out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�")); } } + + + + -- Gitblit v1.8.0