From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 11:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 2e70da5..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
@@ -27,7 +27,6 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
-import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
@@ -35,14 +34,16 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.TBPidService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
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