From 869e40bd5e10882a6c8e2f72db53097936e8fc2e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 28 一月 2019 17:42:01 +0800
Subject: [PATCH] 短连接bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
index f21063d..9666c7a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
@@ -3,20 +3,30 @@
import java.io.PrintWriter;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TBPid;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.factory.MonitorFactory;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -33,6 +43,12 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private MonitorService monitorService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
*
@@ -43,7 +59,8 @@
* @param out
*/
@RequestMapping(value = "gettaobaolink")
- public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
+ public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,
+ PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
@@ -55,20 +72,60 @@
}
JSONObject data = new JSONObject();
- data.put("native", true);
+ boolean isNative = false;
+ String pid = null;
+
+ String specialId = null;
+ // 鏌ヨ鐢ㄦ埛ID鏄惁缁戝畾浜嗕細鍛樿繍钀D
+ UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ if (userInfo != null && !StringUtil.isNullOrEmpty(userInfo.getSpecialId()) && userInfo.getSpecialValid() != null
+ && userInfo.getSpecialValid() == true) {
+ specialId = userInfo.getSpecialId();
+ // 宸茬粡缁戝畾
+ try {
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
+ if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+ isNative = true;
+ } else
+ isNative = false;
+ } catch (TaobaoGoodsDownException e) {
+ out.print(JsonUtil.loadFalseResult(3, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+
+ } else {// 灏氭湭缁戝畾
+ isNative = true;
+ }
try {
int pidType = PidUser.TYPE_FANLI_ANDROID;
if (acceptData.getPlatform().equalsIgnoreCase("ios"))
pidType = PidUser.TYPE_FANLI_IOS;
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+
+ TaoBaoLink taoBaoLink = null;
+ if (!StringUtil.isNullOrEmpty(specialId)) {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ } else {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ }
+
JSONObject link = new JSONObject();
link.put("clickUrl", taoBaoLink.getClickUrl());
link.put("couponUrl", taoBaoLink.getCouponLink());
data.put("type", 1);
data.put("link", link);
out.print(JsonUtil.loadTrueResult(data));
+
} catch (Exception e) {
+ isNative = false;
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "璐拱娣樺疂鍟嗗搧杞摼鍑洪敊"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+
TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);
@@ -88,6 +145,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
}
+ data.put("native", isNative);
}
--
Gitblit v1.8.0