From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 74484c3..5cdab23 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -790,7 +790,7 @@
         if (couponInfo != null) {
             // 鍒搁摼鎺ュ鐞�
             String materialId = "https://item.jd.com/" + id + ".html";
-            String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
+            String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),null,
                     JDApiUtil.POSITION_COUPON + "", null);
             couponInfo.setLink(url);
         }
@@ -923,7 +923,7 @@
             return;
         }
 
-        PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id);
+        PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id,PinDuoDuoApiUtil.PID_FANLI,uid+"");
         if (pddGoods == null) {
             out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
             return;
@@ -935,7 +935,7 @@
         GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
         if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
             goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
-            goodsDetail.getMoneyInfo().setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods,
+            goodsDetail.getMoneyInfo().setShareMoney("楼" + PinDuoDuoUtil.getGoodsShareMoney(pddGoods,
                     hongBaoManageService.getShareRate(UserLevelEnum.superVIP, acceptData.getSystem())));
             goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
             goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
@@ -1489,7 +1489,7 @@
                     Long[] strings = new Long[goodsIdList.size()];
                     pddfilter.setGoodsIdList(goodsIdList.toArray(strings));
 
-                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                     if (result != null) {
                         List<PDDGoodsDetail> goodsList = result.getGoodsList();
                         if (goodsList != null && goodsList.size() > 0) {
@@ -1621,14 +1621,14 @@
             if (couponInfo != null) {
                 couponUrl = couponInfo.getLink();
             }
-            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_COUPON + "",
+            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_COUPON + "",
                     "");
             if (jumpLink == null) {
-                jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, JDApiUtil.POSITION_COUPON + "",
+                jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null,JDApiUtil.POSITION_COUPON + "",
                         "");
             }
         } else {
-            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_COUPON + "",
+            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_COUPON + "",
                     "");
             if (StringUtil.isNullOrEmpty(jumpLink)) {
                 jumpLink = couponUrl;
@@ -1690,14 +1690,14 @@
             if (couponInfo != null) {
                 couponUrl = couponInfo.getLink();
             }
-            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_FANLI + "",
                     uid + "");
             if (jumpLink == null) {
-                jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, JDApiUtil.POSITION_FANLI + "",
+                jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null,JDApiUtil.POSITION_FANLI + "",
                         uid + "");
             }
         } else {
-            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_FANLI + "",
                     uid + "");
             if (StringUtil.isNullOrEmpty(jumpLink)) {
                 jumpLink = couponUrl;
@@ -1727,7 +1727,7 @@
         String jumpLink = null;
         String materialId = "https://item.jd.com/" + id + ".html";
 
-        jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", null);
+        jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_FANLI + "", null);
         if (StringUtil.isNullOrEmpty(jumpLink)) {
             jumpLink = couponUrl;
         }
@@ -1787,6 +1787,7 @@
         data.put("native", true);
         data.put("jumpLink", convertUrl.getUrl());
         data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
+        LogHelper.test(String.format("鎷煎澶氳浆閾�:uid:%s data:%s",uid+"",data.toString()));
         out.print(JsonUtil.loadTrueResult(data));
 
         // 鑾峰緱閲戝竵
@@ -2071,7 +2072,7 @@
             return;
         }
 
-        link = JDApiUtil.convertLinkWithSubUnionId(link, null, JDApiUtil.POSITION_FANLI + "", uid + "");
+        link = JDApiUtil.convertLinkWithSubUnionId(link, null, null,JDApiUtil.POSITION_FANLI + "", uid + "");
 
         JSONObject data = new JSONObject();
         data.put("link", link);

--
Gitblit v1.8.0