From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 56 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 f10a0d6..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
@@ -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;
 
@@ -105,9 +107,15 @@
 			} catch (TaobaoGoodsDownException e) {
 				out.print(JsonUtil.loadFalseResult(3, "鍟嗗搧宸蹭笅鏋�"));
 				return;
+			} catch (Exception e) {
+				try {
+					LogHelper.errorDetailInfo(e, "鑾峰彇鍟嗗搧绠�鐗堣鎯呭嚭閿�", auctionId + "");
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
 			}
 
-			pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+			pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
 
 		} else {// 灏氭湭缁戝畾
 			isNative = true;
@@ -173,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