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 |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 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 a7d6446..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
@@ -84,36 +84,45 @@
 			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;
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e, "鑾峰彇鍟嗗搧绠�鐗堣鎯呭嚭閿�", auctionId + "");
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
+			if (specialConvert) {
+				isNative = true;
+			} else
+				isNative = false;
 
 			pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
 
@@ -195,7 +204,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "isGoodsExtend")
-	public void isGoodsExtend(AcceptData acceptData,String goodsId, String goodsType, PrintWriter out) {
+	public void isGoodsExtend(AcceptData acceptData, String goodsId, String goodsType, PrintWriter out) {
 		if (StringUtil.isNullOrEmpty(goodsId)) {
 			out.print(JsonUtil.loadFalseResult(1, "鏈弬涓庢帹骞�"));
 			return;

--
Gitblit v1.8.0