From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 16:14:13 +0800
Subject: [PATCH] 品牌缓存生效

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index e492da6..3ec1657 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -43,6 +43,7 @@
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.factory.MonitorFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 import net.sf.json.JSONObject;
@@ -155,6 +156,14 @@
 			return;
 		}
 
+		try {
+			// 鏃ュ織璁板綍
+			String info = String.format("type=buy&uid=%s&goodsId=%s&source=%s&goodsType=%s", uid, auctionId, source,
+					Constant.SOURCE_TYPE_TAOBAO);
+			LogHelper.orderInfo(info);
+		} catch (Exception e) {
+		}
+
 		TaoBaoGoodsBrief goods = null;
 
 		try {
@@ -175,13 +184,26 @@
 			return;
 		}
 
+		ClientTBPid clientTBPid = null;
+
+		String dpid = null;
+		if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
+			dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+		} else {
+			dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
+		}
+		String psiteId = dpid.split("_")[2];
+		String padzoneId = dpid.split("_")[3];
+		TaoBaoUnionConfig config1 = taoBaoUnionConfigService.getConfigByAppIdCache(psiteId);
+		clientTBPid = new ClientTBPid(config1.getAppKey(), dpid, psiteId, padzoneId);
+
 		JSONObject data = new JSONObject();
 		boolean isNative = false;
 		String pid = null;
 
 		boolean specialConvert = false;
 
-		if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+		if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
 			specialConvert = true;
 		} else
 			specialConvert = false;
@@ -287,6 +309,8 @@
 			link.put("couponUrl", taoBaoLink.getCouponLink());
 			data.put("type", 1);
 			data.put("link", link);
+			if (clientTBPid != null)
+				data.put("tbPidInfo", clientTBPid);
 			out.print(JsonUtil.loadTrueResult(data));
 
 			// 鑾峰緱閲戝竵
@@ -335,9 +359,9 @@
 					String siteId = tbPid.getPid().split("_")[2];
 					String adzoneId = tbPid.getPid().split("_")[3];
 					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+					ClientTBPid clientTBPid1 = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
 					data.put("type", 2);
-					data.put("tbPidInfo", clientTBPid);
+					data.put("tbPidInfo", clientTBPid1);
 					data.put("native", true);
 				}
 

--
Gitblit v1.8.0