From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改，拼多多初步增加

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java |   88 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 76 insertions(+), 12 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 f10a0d6..8db2e64 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
@@ -19,6 +19,7 @@
 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.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -27,6 +28,7 @@
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.factory.MonitorFactory;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
@@ -82,32 +84,47 @@
 			return;
 		}
 
+		TaoBaoGoodsBrief goods = null;
+
+		try {
+			goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
+		} catch (TaobaoGoodsDownException e) {
+			out.print(JsonUtil.loadFalseResult(3, "鍟嗗搧宸蹭笅鏋�"));
+			return;
+		} catch (Exception e) {
+			try {
+				LogHelper.errorDetailInfo(e, "鑾峰彇鍟嗗搧绠�鐗堣鎯呭嚭閿�", auctionId + "");
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+
 		JSONObject data = new JSONObject();
 		boolean isNative = false;
 		String pid = null;
 
 		boolean specialConvert = false;
 
+		if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+			specialConvert = true;
+		} else
+			specialConvert = false;
+
 		String specialId = null;
+		String relationId=null;
 		// 鏌ヨ鐢ㄦ埛ID鏄惁缁戝畾浜嗕細鍛樿繍钀D
 		UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);
 		if (userInfo != null && !StringUtil.isNullOrEmpty(userInfo.getSpecialId()) && userInfo.getSpecialValid() != null
 				&& userInfo.getSpecialValid() == true) {
 			specialId = userInfo.getSpecialId();
+			relationId=userInfo.getRelationId();
 			// 宸茬粡缁戝畾
-			try {
-				TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
-				if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
-					isNative = true;
-					specialConvert = true;
-				} else
-					isNative = false;
-			} catch (TaobaoGoodsDownException e) {
-				out.print(JsonUtil.loadFalseResult(3, "鍟嗗搧宸蹭笅鏋�"));
-				return;
-			}
+			if (specialConvert) {
+				isNative = true;
+			} else
+				isNative = false;
 
-			pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+			pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
 
 		} else {// 灏氭湭缁戝畾
 			isNative = true;
@@ -173,4 +190,51 @@
 
 	}
 
+	/**
+	 * 鏄惁鍦ㄥ弬涓庢帹骞�
+	 */
+
+	/**
+	 * 鏄惁鍦ㄥ弬涓庢帹骞�
+	 * 
+	 * @param goodsId
+	 *            -鍟嗗搧ID
+	 * @param goodsType
+	 *            -TB/JD
+	 * @param out
+	 */
+	@RequestMapping(value = "isGoodsExtend")
+	public void isGoodsExtend(AcceptData acceptData, String goodsId, String goodsType, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(goodsId)) {
+			out.print(JsonUtil.loadFalseResult(1, "鏈弬涓庢帹骞�"));
+			return;
+		}
+		if (StringUtil.isNullOrEmpty(goodsType)) {
+			out.print(JsonUtil.loadFalseResult(2, "缂哄皯goodsType"));
+			return;
+		}
+		if ("TB".equalsIgnoreCase(goodsType)) {
+			TaoBaoGoodsBrief goods = null;
+			try {
+				goods = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(goodsId));
+			} catch (NumberFormatException e) {
+				e.printStackTrace();
+			} catch (TaobaoGoodsDownException e) {
+				e.printStackTrace();
+			}
+
+			JSONObject data = new JSONObject();
+
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url", "https://h5.m.taobao.com/awp/core/detail.htm?id=" + goodsId);
+			} else {
+				data.put("extend", true);
+			}
+			out.print(JsonUtil.loadTrueResult(data));
+		} else {
+			out.print(JsonUtil.loadFalseResult(3, "鏆備笉鏀寔鍏朵粬鍟嗗搧绫诲瀷"));
+		}
+	}
+
 }

--
Gitblit v1.8.0