From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 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 cd4dc41..fff2e07 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
@@ -385,7 +385,7 @@
             try {
                 goods = TaoKeApiUtil.searchGoodsDetail(id, app);
                 if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
-                    TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+                    TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
                     if (linkInfo != null) {
                         goods.setAuctionUrl(linkInfo.getAuctionUrl());
                         goods.setCouponLink(linkInfo.getCouponLink());
@@ -441,7 +441,7 @@
         if (uid != null && uid > 0) {
             String specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
             //鑾峰彇鏈�鏂扮殑姣斾緥
-            TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCoupon(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli)), specialId, null);
+            TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCouponV2(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli)), specialId, null);
             if (rateGoods != null)
                 tb.setMinTkRate(rateGoods.getTkRate());
         }
@@ -742,7 +742,7 @@
      * @param out
      */
     @RequestMapping(value = "getDetailJD")
-    public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+    public void getDetialJD(AcceptData acceptData, String id, Long uid, String from, PrintWriter out) {
         // uid=2255993L;
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -754,7 +754,7 @@
 
         JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id); // 楂樼骇鎺ュ彛
         if (jdGoods == null) {
-            jdGoods = JDUtil.getGoodsDetail(id); // 鐖彇缃戦〉
+//            jdGoods = JDUtil.getGoodsDetail(id); // 鐖彇缃戦〉
             // jdGoods = JDApiUtil.getGoodsDetail(id); // 鏅�氭帴鍙�
         }
 
@@ -908,7 +908,7 @@
         }
 
         // 鍥炬枃璇︽儏
-        extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + id + ".html");
+        extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + jdGoods.getSpuid() + ".html");
 
         // 娴嬭瘯
         SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
@@ -976,7 +976,7 @@
      * @param out
      */
     @RequestMapping(value = "getDetailPDD", method = RequestMethod.POST)
-    public void getDetialPDD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+    public void getDetialPDD(AcceptData acceptData, String id, Long uid, String from, PrintWriter out) {
         // 绯荤粺楠岃瘉
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
                 acceptData.getPackages(), acceptData.getSystem());
@@ -1869,7 +1869,7 @@
      * @param source
      * @param out
      */
-    private void getJDLinkWithoutFanLi(AcceptData acceptData, Long id, String couponUrl, String source, PrintWriter out) {
+    private void getJDLinkWithoutFanLi(AcceptData acceptData, String id, String couponUrl, String source, PrintWriter out) {
         JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(id);
         if (goods == null) {
             out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
@@ -1941,10 +1941,10 @@
      * @param out
      */
     @RequestMapping(value = "getJDLink")
-    public void getJDLink(AcceptData acceptData, Long uid, Long id, String couponUrl, String source, PrintWriter out) {
+    public void getJDLink(AcceptData acceptData, Long uid, String id, String couponUrl, String source, PrintWriter out) {
 
 
-        if (id == null || id <= 0) {
+        if (StringUtil.isNullOrEmpty(id)) {
             out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
             return;
         }
@@ -1983,8 +1983,7 @@
         }
 
         String jumpLink = null;
-        String materialId = "https://item.jd.com/" + id + ".html";
-
+        String materialId = JDUtil.getMaterialId(id);
         String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.fanli);
 
         if (StringUtil.isNullOrEmpty(couponUrl)) {
@@ -2068,9 +2067,9 @@
      * @param out
      */
     @RequestMapping(value = "getPDDLink")
-    public void getPDDLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) {
+    public void getPDDLink(AcceptData acceptData, Long uid, String id, String source, PrintWriter out) {
 
-        if (id == null || id <= 0) {
+        if (id == null ) {
             out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
             return;
         }
@@ -2355,7 +2354,7 @@
             }
 
         } else if (goodsType == Constant.SOURCE_TYPE_JD) {
-            JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId));
+            JDGoods goods = JDApiUtil.getGoodsDetail(goodsId);
             if (goods == null) {
                 data.put("extend", false);
                 data.put("url", String.format("https://item.m.jd.com/product/%s.html", goodsId));
@@ -2363,7 +2362,7 @@
                 data.put("extend", true);
             }
         } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
-            PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId));
+            PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(goodsId);
             if (goods == null) {
                 data.put("extend", false);
                 data.put("url", String.format("https://mobile.yangkeduo.com/goods.html?goods_id=%s", goodsId));
@@ -2416,7 +2415,7 @@
 
         // 鍒嗙鍚勪釜骞冲彴鐨勫晢鍝佷俊鎭�
         List<String> tbGoodsList = new ArrayList<>();
-        List<Long> jdGoodsList = new ArrayList<>();
+        List<String> jdGoodsList = new ArrayList<>();
         List<Long> pddGoodsList = new ArrayList<>();
 
         List<String> keyList = new ArrayList<>();
@@ -2426,7 +2425,7 @@
             if (cg.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
                 tbGoodsList.add(cg.getGoodsId());
             } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_JD) {
-                jdGoodsList.add(Long.parseLong(cg.getGoodsId()));
+                jdGoodsList.add(cg.getGoodsId());
             } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
                 pddGoodsList.add(Long.parseLong(cg.getGoodsId()));
             }
@@ -2457,7 +2456,7 @@
         if (jdGoodsList.size() > 0) {
             List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
             for (JDGoods goods : goodsList) {
-                tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,
+                tempGoodsList.put(goods.getItemId() + "-" + Constant.SOURCE_TYPE_JD,
                         GoodsDetailVOFactory.convertJDGoods(goods, params));
             }
         }

--
Gitblit v1.8.0