From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 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 1dba1d3..a7d6446 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
@@ -28,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;
 
@@ -114,7 +115,7 @@
 				}
 			}
 
-			pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+			pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
 
 		} else {// 灏氭湭缁戝畾
 			isNative = true;
@@ -180,4 +181,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