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/util/taobao/TaoKeScApiUtil.java |   90 +++++++++++++++++++++------------------------
 1 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeScApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeScApiUtil.java
index 82e1d06..3aae756 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeScApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeScApiUtil.java
@@ -59,7 +59,7 @@
                 JSONObject item = array.optJSONObject(i);
                 TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
                 goods.setPictUrl(item.optString("pict_url"));
-                goods.setAuctionId(item.optLong("num_iid"));
+                goods.setAuctionId(item.optString("num_iid"));
                 goods.setAuctionUrl(item.optString("item_url"));
                 goods.setBiz30day(item.optInt("volume"));
                 goods.setCouponInfo(item.optString("coupon_info"));
@@ -148,7 +148,7 @@
 
     private static TaoBaoGoodsBrief parseSimpleGoodsInfo(JSONObject item) {
         TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
-        goods.setAuctionId(item.optLong("num_iid"));
+        goods.setAuctionId(item.optString("num_iid"));
         goods.setAuctionUrl(item.optString("item_url"));
         goods.setBiz30day(item.optInt("volume"));
         if (item.optJSONObject("small_images") != null) {
@@ -312,8 +312,8 @@
         if (result != null && result.getTaoBaoGoodsBriefs() != null)
             for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
                 System.out.println(goods.getAuctionId() + ":" + g.getAuctionId());
-                if (goods.getAuctionId().longValue() == g.getAuctionId()) {
-                    g.setId(goods.getAuctionId());
+                if (TaoBaoUtil.isEqual( goods.getAuctionId(), g.getAuctionId())) {
+                    g.setAuctionId(goods.getAuctionId());
                     g.setCreatetime(new Date());
                     g.setMaterialLibType(goods.getMaterialLibType());
                     g.setProvcity(goods.getProvcity());
@@ -373,8 +373,8 @@
                 goods.getUserType(), app);
         if (result != null && result.getTaoBaoGoodsBriefs() != null)
             for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
-                if (goods.getAuctionId().longValue() == g.getAuctionId()) {
-                    g.setId(goods.getAuctionId());
+                if (TaoBaoUtil.isEqual(goods.getAuctionId(), g.getAuctionId())) {
+                    g.setAuctionId(goods.getAuctionId());
                     // 鍒ゆ柇鏄惁鏈変紭鎯犲埜
                     if (!StringUtil.isNullOrEmpty(g.getCouponActivityId())) {
                         // 鑾峰彇浼樻儬鍒歌鎯�
@@ -451,8 +451,8 @@
                 goods.getUserType(), app);
         if (result != null && result.getTaoBaoGoodsBriefs() != null)
             for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
-                if (goods.getAuctionId().longValue() == g.getAuctionId()) {
-                    g.setId(goods.getAuctionId());
+                if (TaoBaoUtil.isEqual( goods.getAuctionId(), g.getAuctionId())) {
+                    g.setAuctionId(goods.getAuctionId());
                     g.setCreatetime(new Date());
                     return g;
                 }
@@ -492,8 +492,8 @@
                     goods.getUserType());
             if (result != null && result.getTaoBaoGoodsBriefs() != null)
                 for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
-                    if (goods.getAuctionId().longValue() == g.getAuctionId()) {
-                        g.setId(goods.getAuctionId());
+                    if ( TaoBaoUtil.isEqual(goods.getAuctionId(), g.getAuctionId())) {
+                        g.setAuctionId(goods.getAuctionId());
                         g.setAuctionUrl(goods.getAuctionUrl());
                         g.setShopTitle(goods.getShopTitle());
 
@@ -529,9 +529,9 @@
             if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
                     && searchResult.getTaoBaoGoodsBriefs().size() > 0) {
                 for (TaoBaoGoodsBrief g : searchResult.getTaoBaoGoodsBriefs()) {
-                    if (g.getAuctionId().longValue() == goods.getAuctionId()) {
+                    if (TaoBaoUtil.isEqual(g.getAuctionId() , goods.getAuctionId())) {
                         g.setImgList(goods.getImgList());
-                        g.setId(goods.getAuctionId());
+                        g.setAuctionId(goods.getAuctionId());
                         g.setAuctionUrl(goods.getAuctionUrl());
                         g.setShopTitle(goods.getShopTitle());
 
@@ -780,7 +780,6 @@
     /**
      * 鍟嗗搧鐗╂枡鎼滅储
      *
-     * @param filter
      * @return
      */
     public static TaoBaoSearchResult searchWuLiaoForDetail(String title, BigDecimal zkPrice, String provcity,
@@ -831,7 +830,6 @@
     /**
      * 鍟嗗搧鐗╂枡鎼滅储
      *
-     * @param filter
      * @return
      */
     public static TaoBaoSearchResult searchWuLiaoForDetail(String title, BigDecimal zkPrice, String provcity,
@@ -887,7 +885,7 @@
             goods.setPictUrlWhite(item.optString("white_image"));
         }
 
-        goods.setAuctionId(item.optLong("num_iid"));
+        goods.setAuctionId(item.optString("num_iid"));
         goods.setAuctionUrl("https:" + item.optString("url"));
         goods.setBiz30day(item.optInt("volume"));
         goods.setCouponInfo(item.optString("coupon_info"));
@@ -1007,7 +1005,7 @@
      * @param activityId
      * @return
      */
-    public static TaoKeApiUtil.QuanInfo getQuanInfo(Long auctionId, String activityId) {
+    public static TaoKeApiUtil.QuanInfo getQuanInfo(String auctionId, String activityId) {
         TaoKeApiUtil.QuanInfo info = new TaoKeApiUtil.QuanInfo();
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.coupon.get");
@@ -1209,8 +1207,6 @@
     /**
      * 搴楅摵鎼滅储
      *
-     * @param key  -搴楅摵鍚嶇О
-     * @param page -椤电爜
      * @return
      */
     public static List<TaoBaoShopInfo> searchShop(SearchShopFilter filter) {
@@ -1275,7 +1271,7 @@
         System.out.println(resultStr);
     }
 
-    public static void getTAEGoodsDetail(Long auctionId) {
+    public static void getTAEGoodsDetail(String auctionId) {
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tae.items.list");
         map.put("fields", "title,nick,pic_url,location,cid,price,post_fee,promoted_service,ju,shop_name");
@@ -1608,7 +1604,7 @@
         return null;
     }
 
-    public static void specialConvertItem(Long auctionId, TaoKeAppInfo app) {
+    public static void specialConvertItem(String auctionId, TaoKeAppInfo app) {
         String pid = app.getPid();
         String[] sts = pid.split("_");
         Map<String, String> map = new HashMap<>();
@@ -1625,7 +1621,7 @@
         }
     }
 
-    public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app) {
+    public static TaoBaoGoodsBrief specialConvertCoupon(String auctionId, TaoKeAppInfo app) {
         String pid = app.getPid();
         String[] sts = pid.split("_");
         Map<String, String> map = new HashMap<>();
@@ -1697,7 +1693,7 @@
         TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
         // 璁剧疆鎴�320*320鐨勫浘鐗囧昂瀵�
         goods.setPictUrl(TbImgUtil.getTBSize320Img("https:" + item.optString("pict_url")));
-        goods.setAuctionId(item.optLong("item_id"));
+        goods.setAuctionId(item.optString("item_id"));
         goods.setAuctionUrl("https://item.taobao.com/item.htm?id=" + goods.getAuctionId());
         goods.setBiz30day(item.optInt("volume"));
         if (!StringUtil.isNullOrEmpty(item.optString("coupon_amount"))) {
@@ -1841,7 +1837,7 @@
     }
 
     // 娣樼ぜ閲戝垱寤�
-    public static TaoLiJinDTO createTaoLiJin(Long auctionId, String name, BigDecimal perface, int totalNum,
+    public static TaoLiJinDTO createTaoLiJin(String auctionId, String name, BigDecimal perface, int totalNum,
                                              Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime, TaoKeAppInfo app)
             throws TaoLiJinCreateException, TaoKeApiException {
         Map<String, String> map = new HashMap<>();
@@ -1905,10 +1901,11 @@
     }
 
     // 娣樼ぜ閲戞姤鍛�
-    public static UserTaoLiJinReport getTaoLiJinEffective(String rightsId) {
+    public static UserTaoLiJinReport getTaoLiJinEffective(String rightsId, String pid) {
         Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.dg.vegas.tlj.instance.report");
+        map.put("method", "taobao.tbk.dg.vegas.tlj.report(");
         map.put("rights_id", rightsId);
+        map.put("adzone_id", pid.split("_")[3]);
 
         TaoKeAppInfo app = new TaoKeAppInfo();
         app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
@@ -1919,27 +1916,24 @@
             JSONObject json = JSONObject.fromObject(result);
             System.out.println(json);
 
-            JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_instance_report_response");
+            JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_report_response");
 
-            if (root != null && root.optJSONObject("result") != null) {
-                if (root.optJSONObject("result").optBoolean("success")) {
-                    JSONObject modelJson = root.optJSONObject("result").optJSONObject("model");
-
-                    if (modelJson != null && modelJson.size() > 0) {
-                        UserTaoLiJinReport report = new UserTaoLiJinReport();
-                        report.setId(rightsId);
-                        report.setUnfreezeAmount(new BigDecimal(modelJson.optString("unfreeze_amount")));
-                        report.setUnfreezeNum(modelJson.optInt("unfreeze_num"));
-                        report.setRefundAmount(new BigDecimal(modelJson.optString("refund_amount")));
-                        report.setRefundNum(modelJson.optInt("refund_num"));
-                        report.setAlipayAmount(new BigDecimal(modelJson.optString("alipay_amount")));
-                        report.setUseAmount(new BigDecimal(modelJson.optString("use_amount")));
-                        report.setUseNum(modelJson.optInt("use_num"));
-                        report.setWinAmount(new BigDecimal(modelJson.optString("win_amount")));
-                        report.setWinNum(modelJson.optInt("win_num"));
-                        report.setPreCommissionAmount(new BigDecimal(modelJson.optString("pre_commission_amount")));
-                        return report;
-                    }
+            if (root != null && root.optBoolean("result_success")) {
+                JSONObject modelJson = root.optJSONObject("model").optJSONObject("extra");
+                if (modelJson != null && modelJson.size() > 0) {
+                    UserTaoLiJinReport report = new UserTaoLiJinReport();
+                    report.setId(rightsId);
+                    report.setWinAmount(new BigDecimal(modelJson.optString("win_sum_amt")));
+                    report.setWinNum(modelJson.optInt("win_pv"));
+                    report.setRefundAmount(new BigDecimal(modelJson.optString("refund_sum_amt")));
+                    report.setRefundNum(modelJson.optInt("refund_num"));
+                    report.setAlipayAmount(new BigDecimal(modelJson.optString("alipay_amt")));
+                    report.setUseAmount(new BigDecimal(modelJson.optString("use_sum_amt")));
+                    report.setUseNum(modelJson.optInt("use_num"));
+                    report.setUnfreezeAmount(new BigDecimal(modelJson.optString("remaining_amt")));
+                    report.setUnfreezeNum(modelJson.optInt("remaining_num"));
+                    report.setPreCommissionAmount(new BigDecimal(modelJson.optString("pre_pub_share_fee_for_disp")));
+                    return report;
                 }
             }
         } catch (Exception e) {
@@ -1948,7 +1942,7 @@
         return null;
     }
 
-    public static void getCouponByAuctionId(Long auctionId) {
+    public static void getCouponByAuctionId(String auctionId) {
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.itemid.coupon.get");
         map.put("platform", 2 + "");
@@ -2019,7 +2013,7 @@
         return null;
     }
 
-    public static List<TaoBaoGoodsBrief> guessLikeByAuctionId(Long auctionId, int count) {
+    public static List<TaoBaoGoodsBrief> guessLikeByAuctionId(String auctionId, int count) {
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.dg.optimus.material");
         map.put("item_id", auctionId + "");
@@ -2052,7 +2046,7 @@
         return goodsList;
     }
 
-    public static List<TaoBaoGoodsBrief> getCouponListByItemId(Long auctionId) {
+    public static List<TaoBaoGoodsBrief> getCouponListByItemId(String auctionId) {
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.itemid.coupon.get");
         map.put("platform", auctionId + "");

--
Gitblit v1.8.0