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/TaoKeApiUtil.java |  871 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 595 insertions(+), 276 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index a3e7504..f137847 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.util.taobao;
 
+import com.google.gson.Gson;
 import com.yeshi.common.entity.PageEntity;
 import com.yeshi.common.entity.taobao.TaoBaoShopInfo;
 import com.yeshi.common.entity.taobao.TaoKeAppInfo;
@@ -20,10 +21,12 @@
 import com.yeshi.goods.facade.dto.taobao.TaoBaoShopInfoDTO;
 import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.goods.facade.entity.taobao.TaoBaoHead;
+import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.NumberUtil;
 import org.yeshi.utils.TimeUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 
@@ -33,88 +36,17 @@
 //娣樺疂瀹PI鎺ュ彛
 public class TaoKeApiUtil {
 
-    // 瑙f瀽鍒哥殑鍐呭
-    private static TaoBaoSearchResult parseCoupleContent(String content) {
-        TaoBaoSearchResult result = new TaoBaoSearchResult();
-        JSONObject root = JSONObject.fromObject(content);
-
-        root = root.optJSONObject("tbk_dg_item_coupon_get_response");
-        if (root.optJSONObject("results") == null)
-            return null;
-
-        JSONArray array = root.optJSONObject("results").optJSONArray("tbk_coupon");
-        if (array != null) {
-            List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
-            for (int i = 0; i < array.size(); i++) {
-                JSONObject item = array.optJSONObject(i);
-                TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
-                goods.setPictUrl(item.optString("pict_url"));
-                goods.setAuctionId(item.optLong("num_iid"));
-                goods.setAuctionUrl(item.optString("item_url"));
-                goods.setBiz30day(item.optInt("volume"));
-                goods.setCouponInfo(item.optString("coupon_info"));
-                List<BigDecimal> quanInfo = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
-                goods.setCouponAmount(quanInfo.get(1));
-                goods.setCouponEffectiveEndTime(item.optString("coupon_end_time"));
-                goods.setCouponEffectiveStartTime(item.optString("coupon_start_time"));
-                goods.setCouponStartFee(quanInfo.get(0));
-                goods.setCouponLeftCount(item.optInt("coupon_remain_count"));
-                goods.setCouponLink(item.optString("coupon_click_url"));
-                goods.setCouponTotalCount(item.optInt("coupon_total_count"));
-                goods.setDayLeft(-1);
-                if (item.optJSONObject("small_images") != null) {
-                    JSONArray imgArray = item.optJSONObject("small_images").optJSONArray("string");
-                    if (imgArray != null) {
-                        List<String> imgList = new ArrayList<>();
-                        for (int n = 0; n < imgArray.size(); n++) {
-                            imgList.add(imgArray.optString(n));
-                        }
-                        goods.setImgList(imgList);
-                    }
-                }
-
-                goods.setSellerId(item.optLong("seller_id"));
-                goods.setShopTitle(item.optString("shop_title"));
-                goods.setTitle(item.optString("title"));
-
-                goods.setTkRate(new BigDecimal(item.optString("commission_rate")));
-                goods.setTotalNum(1000);
-                goods.setUserType(item.optInt("user_type"));
-                goods.setUserTypeName("");
-                goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
-
-                if (goods.getZkPrice().compareTo(goods.getCouponStartFee()) >= 0
-                        && goods.getZkPrice().compareTo(goods.getCouponAmount()) > 0) {
-                    BigDecimal finalPrice = goods.getZkPrice().subtract(goods.getCouponAmount());
-                    goods.setTkCommFee(finalPrice.multiply(goods.getTkRate()).divide(new BigDecimal(100)));
-                } else
-                    goods.setTkCommFee(new BigDecimal(0));
-
-                goodsList.add(goods);
-            }
-
-            result.setTaoBaoGoodsBriefs(goodsList);
-
-            int totalCount = 1000;// root.optInt("total_results");
-            PageEntity pe = new PageEntity(0, 0, totalCount);
-            result.setPageEntity(pe);
-        }
-        result.setNavList(new ArrayList<>());
-        TaoBaoHead taoBaoHead = new TaoBaoHead();
-        taoBaoHead.setDocsfound((int) result.getPageEntity().getTotalCount());
-        result.setTaoBaoHead(taoBaoHead);
-        return result;
-    }
-
     /**
      * 鑾峰彇鍟嗗搧璇︽儏锛岀畝鐗�
      *
      * @param id -鍟嗗搧AuctionId
      * @return
      */
-    public static TaoBaoGoodsBrief getSimpleGoodsInfo(Long id) throws TaobaoGoodsDownException {
+    public static TaoBaoGoodsBrief getSimpleGoodsInfo(String id) throws TaobaoGoodsDownException {
         Map<String, String> map = new HashMap<>();
+
         map.put("method", "taobao.tbk.item.info.get");
+
         map.put("num_iids", id + "");
         String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
         System.out.println(resultStr);
@@ -125,22 +57,69 @@
             throw new TaobaoGoodsDownException(data.optJSONObject("error_response").optInt("code"), "鍟嗗搧涓嬫灦");
         }
 
+        //TODO 淇敼涓存椂鎺ュ彛 tbk_item_info_get_response
         if (data.optJSONObject("tbk_item_info_get_response") == null)
             return null;
         JSONArray array = data.optJSONObject("tbk_item_info_get_response").optJSONObject("results")
                 .optJSONArray("n_tbk_item");
         if (array != null && array.size() > 0) {
             JSONObject item = array.optJSONObject(0);
-            return parseSimpleGoodsInfo(item);
+            TaoBaoGoodsBrief goods = parseSimpleGoodsInfo(item);
+            if (goods != null && !NumberUtil.isNumeric(id)) {
+                goods.setAuctionId(id);
+            }
+            return goods;
+        }
+        return null;
+    }
+
+    // 鑾峰彇鍟嗗搧璇︽儏鑷喘
+    public static TaoBaoGoodsBrief getSimpleGoodsInfoForOwnBuy(String id) throws TaobaoGoodsDownException {
+        Map<String, String> map = new HashMap<>();
+
+        map.put("method", "taobao.tbk.item.info.get");
+
+        map.put("num_iids", id + "");
+        String resultStr = null;
+        if (!NumberUtil.isNumeric(id)) {
+            resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+        } else {
+            map.put("biz_scene_id", "2");
+            resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, TaoBaoConstant.getSpecialAuthAppInfo(TaoBaoConstant.TAOBAO_PID_DEFAULT));
+        }
+        System.out.println(resultStr);
+        JSONObject data = JSONObject.fromObject(resultStr);
+        // 鍟嗗搧涓嬫灦
+        if (data.optJSONObject("error_response") != null && data.optJSONObject("error_response").optInt("code") == 15
+                && data.optJSONObject("error_response").optInt("sub_code") == 50001) {
+            throw new TaobaoGoodsDownException(data.optJSONObject("error_response").optInt("code"), "鍟嗗搧涓嬫灦");
+        }
+
+        //TODO 淇敼涓存椂鎺ュ彛 tbk_item_info_get_response
+        if (data.optJSONObject("tbk_item_info_get_response") == null)
+            return null;
+        JSONArray array = data.optJSONObject("tbk_item_info_get_response").optJSONObject("results")
+                .optJSONArray("n_tbk_item");
+        if (array != null && array.size() > 0) {
+            JSONObject item = array.optJSONObject(0);
+            TaoBaoGoodsBrief goods = parseSimpleGoodsInfo(item);
+            if (goods != null && !NumberUtil.isNumeric(id)) {
+                goods.setAuctionId(id);
+            }
+            return goods;
         }
         return null;
     }
 
     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.containsKey("annual_vol")) {
+            goods.setBiz30day(item.optInt("annual_vol") / 12);
+        } else {
+            goods.setBiz30day(item.optInt("volume"));
+        }
         if (item.optJSONObject("small_images") != null) {
             JSONArray imgArray = item.optJSONObject("small_images").optJSONArray("string");
             if (imgArray != null) {
@@ -209,29 +188,32 @@
     }
 
     private static TaoBaoGoodsBrief loadYuShouInfo(TaoBaoGoodsBrief goods, JSONObject item) {
+
         if (goods != null && item != null) {
-            // 棰勫敭鐩稿叧瑙f瀽
-            goods.setYsylClickUrl(item.optString("ysyl_click_url"));
-            if (!StringUtil.isNullOrEmpty(item.optString("ysyl_commission_rate")))
-                goods.setYsylCommissionRate(new BigDecimal(item.optString("ysyl_commission_rate")));
-            goods.setYsylTljFace(item.optString("ysyl_tlj_face"));
-            goods.setYsylTljSendTime(item.optString("ysyl_tlj_send_time"));
-            goods.setYsylTljUseEndTime(item.optString("ysyl_tlj_use_end_time"));
-            goods.setYsylTljUseStartTime(item.optString("ysyl_tlj_use_start_time"));
+            JSONObject preSaleInfo = item.optJSONObject("presale_info");
+            if (preSaleInfo != null) {
+                // 棰勫敭鐩稿叧瑙f瀽
+                goods.setYsylClickUrl(item.optString("ysyl_click_url"));
+                if (!StringUtil.isNullOrEmpty(item.optString("ysyl_commission_rate")))
+                    goods.setYsylCommissionRate(new BigDecimal(item.optString("ysyl_commission_rate")));
+                goods.setYsylTljFace(item.optString("ysyl_tlj_face"));
+                goods.setYsylTljSendTime(item.optString("ysyl_tlj_send_time"));
+                goods.setYsylTljUseEndTime(item.optString("ysyl_tlj_use_end_time"));
+                goods.setYsylTljUseStartTime(item.optString("ysyl_tlj_use_start_time"));
 
-            goods.setPresaleDeposit(item.optString("presale_deposit"));
-            goods.setPresaleDiscountFeeText(item.optString("presale_discount_fee_text"));
-            goods.setPresaleEndTime(item.optString("presale_end_time"));
-            goods.setPresaleStartTime(item.optString("presale_start_time"));
-            goods.setPresaleTailEndTime(item.optString("presale_tail_end_time"));
-            goods.setPresaleTailStartTime(item.optString("presale_tail_start_time"));
-
-            return goods;
+                goods.setPresaleDeposit(preSaleInfo.optString("presale_deposit"));
+                goods.setPresaleDiscountFeeText(preSaleInfo.optString("presale_discount_fee_text"));
+                goods.setPresaleEndTime(preSaleInfo.optString("presale_end_time"));
+                goods.setPresaleStartTime(preSaleInfo.optString("presale_start_time"));
+                goods.setPresaleTailEndTime(preSaleInfo.optString("presale_tail_end_time"));
+                goods.setPresaleTailStartTime(preSaleInfo.optString("presale_tail_start_time"));
+                return goods;
+            }
         }
         return goods;
     }
 
-    public static List<TaoBaoGoodsBrief> getBatchGoodsInfo(List<Long> listId)
+    public static List<TaoBaoGoodsBrief> getBatchGoodsInfo(List<String> listId)
             throws TaoKeApiException, TaobaoGoodsDownException {
         if (listId == null || listId.size() == 0) {
             throw new TaobaoGoodsDownException(1, "娣樺疂鍟嗗搧ID涓嶈兘涓虹┖");
@@ -242,7 +224,7 @@
         }
 
         StringBuffer ids = new StringBuffer();
-        for (Long id : listId) {
+        for (String id : listId) {
             ids.append(id + ",");
         }
 
@@ -351,7 +333,7 @@
      * @return
      * @throws TaobaoGoodsDownException
      */
-    public static TaoBaoGoodsBrief searchGoodsDetail(Long id, String specialId, String relationId) throws TaobaoGoodsDownException {
+    public static TaoBaoGoodsBrief searchGoodsDetail(String id, String specialId, String relationId) throws TaobaoGoodsDownException {
         TaoBaoGoodsBrief goods = getSimpleGoodsInfo(id);
         if (goods == null)
             return null;
@@ -364,8 +346,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());
@@ -374,9 +356,9 @@
             }
 
         // 浠庤浆閾炬悳绱�
-        TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
+        TaoBaoGoodsBrief newGoods = specialConvertCouponV2(goods.getAuctionId(),
                 new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
-                        TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), specialId, relationId);
+                        TaoBaoConstant.TAOBAO_PID_DEFAULT), specialId, relationId);
 
         if (newGoods != null) {
             goods.setTkRate(newGoods.getTkRate());
@@ -406,7 +388,7 @@
 
     }
 
-    public static TaoBaoGoodsBrief searchGoodsDetail(Long id) throws TaobaoGoodsDownException {
+    public static TaoBaoGoodsBrief searchGoodsDetail(String id) throws TaobaoGoodsDownException {
         return searchGoodsDetail(id, null, null);
     }
 
@@ -417,7 +399,7 @@
      * @return
      * @throws TaobaoGoodsDownException
      */
-    public static TaoBaoGoodsBrief searchGoodsDetail(Long id, TaoKeAppInfo app) throws TaobaoGoodsDownException {
+    public static TaoBaoGoodsBrief searchGoodsDetail(String id, TaoKeAppInfo app) throws TaobaoGoodsDownException {
         TaoBaoGoodsBrief goods = getSimpleGoodsInfo(id);
         if (goods == null)
             return null;
@@ -429,8 +411,8 @@
                 goods.getUserType(), app, null, null);
         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())) {
                         // 鑾峰彇浼樻儬鍒歌鎯�
@@ -455,9 +437,9 @@
             }
 
         // 浠庤浆閾炬悳绱�
-        TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
+        TaoBaoGoodsBrief newGoods = specialConvertCouponV2(goods.getAuctionId(),
                 new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
-                        TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), null, null);
+                        TaoBaoConstant.TAOBAO_PID_DEFAULT), null, null);
 
         if (newGoods != null) {
             goods.setTkRate(newGoods.getTkRate());
@@ -496,7 +478,7 @@
      * @return
      * @throws TaobaoGoodsDownException
      */
-    public static TaoBaoGoodsBrief searchGoodsDetailForConvert(Long id, TaoKeAppInfo app, String specialId, String relationId)
+    public static TaoBaoGoodsBrief searchGoodsDetailForConvert(String id, TaoKeAppInfo app, String specialId, String relationId)
             throws TaobaoGoodsDownException {
         TaoBaoGoodsBrief goods = getSimpleGoodsInfo(id);
         if (goods == null)
@@ -509,8 +491,8 @@
                 goods.getUserType(), app, specialId, relationId);
         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;
                 }
@@ -550,8 +532,8 @@
                     goods.getUserType(), null, null);
             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());
 
@@ -587,9 +569,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());
 
@@ -632,8 +614,8 @@
         if (filter.getKey() != null && filter.getKey().trim().equalsIgnoreCase(""))
             return null;
 
-        if (filter.getKey() != null && filter.getKey().length() > 100)
-            return null;
+//        if (filter.getKey() != null && filter.getKey().length() > 100)
+//            return null;
 
         PageEntity pageEntity = new PageEntity();
         TaoBaoSearchResult taoBaoSearchResult = new TaoBaoSearchResult();
@@ -641,6 +623,10 @@
         map.put("method", "taobao.tbk.dg.material.optional");
         map.put("page_size", filter.getPageSize() == 0 ? "20" : filter.getPageSize() + "");
         map.put("page_no", (filter.getPage() <= 0 ? 1 : filter.getPage()) + "");
+        //1-鍔ㄦ�両D杞摼鍦烘櫙锛�2-娑堣垂鑰呮瘮浠峰満鏅紙涓嶅~榛樿涓�1锛�
+//        map.put("biz_scene_id","2");
+//        map.put("promotion_type","1");
+
         if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
             map.put("special_id", specialId);
         } else if (!StringUtil.isNullOrEmpty(specialId)) {
@@ -752,8 +738,9 @@
         }
 
         String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
-        // System.out.println("resultStr"+ resultStr);
+        System.out.println("resultStr" + resultStr);
         JSONObject data = JSONObject.fromObject(resultStr);
+        //TODO 涓存椂鎺ュ彛tbk_dg_material_optional_response
         if (data.optJSONObject("tbk_dg_material_optional_response") != null
                 && data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list") != null) {
             JSONArray array = data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list")
@@ -770,6 +757,195 @@
 
             JSONObject optJSONObject = data.optJSONObject("tbk_dg_material_optional_response");
             int totalResults = optJSONObject.getInt("total_results");
+            int totalPage = totalResults % pageEntity.getPageSize() == 0 ? totalResults / pageEntity.getPageSize()
+                    : totalResults / pageEntity.getPageSize() + 1;
+            pageEntity.setTotalCount(totalResults);
+            pageEntity.setTotalPage(totalPage);
+
+        }
+
+        List<TaoBaoSearchNav> navList = new ArrayList<>();
+
+        TaoBaoHead taoBaoHead = new TaoBaoHead();
+        taoBaoHead.setDocsfound((int) pageEntity.getTotalCount());
+        taoBaoSearchResult.setTaoBaoHead(taoBaoHead);
+
+        taoBaoSearchResult.setPageEntity(pageEntity);
+
+        // filter.get
+
+        // 璁剧疆鍙戣揣鍦板潃
+        TaoBaoSearchNav nav = new TaoBaoSearchNav();
+        nav.setName("鍙戣揣鍦伴�夋嫨");
+        nav.setFlag("address");
+        nav.setId(11110);
+        nav.setType("fahuodi");
+
+        List<TaoBaoSearchNav> childNavList = new ArrayList<>();
+        List<TaoBaoProvince> provinceList = TaoBaoUtil.getTaoBaoProvinceList();
+        for (TaoBaoProvince province : provinceList) {
+            TaoBaoSearchNav childNav = new TaoBaoSearchNav();
+            childNav.setName(province.getName());
+            childNav.setId(Integer.parseInt(province.getId()));
+            childNav.setType("fahuodi-child");
+            if (Integer.parseInt(province.getId()) == filter.getProvinceId())
+                childNav.setSelector(1);
+            childNavList.add(childNav);
+        }
+
+        nav.setSubIds(childNavList);
+        navList.add(nav);
+
+        // 娴嬭瘯
+        taoBaoSearchResult.setNavList(navList);
+
+        return taoBaoSearchResult;
+    }
+
+
+    public static TaoBaoSearchResult searchWuLiaoNew(SearchFilter filter, String specialId, String relationId) {
+
+        if (filter.getKey() != null && filter.getKey().trim().equalsIgnoreCase(""))
+            return null;
+
+        PageEntity pageEntity = new PageEntity();
+        TaoBaoSearchResult taoBaoSearchResult = new TaoBaoSearchResult();
+        Map<String, String> map = new HashMap<>();
+        map.put("method", "taobao.tbk.dg.material.optional.upgrade");
+        map.put("page_size", filter.getPageSize() == 0 ? "20" : filter.getPageSize() + "");
+        map.put("page_no", (filter.getPage() <= 0 ? 1 : filter.getPage()) + "");
+        //1-鍔ㄦ�両D杞摼鍦烘櫙锛�2-娑堣垂鑰呮瘮浠峰満鏅紙涓嶅~榛樿涓�1锛�
+//        map.put("biz_scene_id","2");
+//        map.put("promotion_type","1");
+
+        if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
+            map.put("special_id", specialId);
+        } else if (!StringUtil.isNullOrEmpty(specialId)) {
+            map.put("special_id", specialId);
+        } else if (!StringUtil.isNullOrEmpty(relationId)) {
+            map.put("relation_id", relationId);
+        }
+
+        // map.put("material_id", "3756");
+
+        pageEntity.setPageIndex(filter.getPage());
+        pageEntity.setPageSize(filter.getPageSize() == 0 ? 20 : filter.getPageSize());
+
+        // 鍖呭惈浜嗗湴鍖虹瓫閫�
+        if (filter.getProvinceId() > 0) {
+            List<TaoBaoProvince> provinceList = TaoBaoUtil.getTaoBaoProvinceList();
+
+            for (TaoBaoProvince province : provinceList) {
+                if (Integer.parseInt(province.getId()) == filter.getProvinceId()) {
+                    map.put("itemloc", province.getName());
+                    break;
+                }
+            }
+        }
+
+        if (filter.getMaterialId() != null)
+            map.put("material_id", filter.getMaterialId());
+
+        if (filter.getStartPrice() != null)
+            map.put("start_price", filter.getStartPrice() + "");
+
+        if (filter.getEndPrice() != null)
+            map.put("end_price", filter.getEndPrice() + "");
+
+        if (filter.getStartTkRate() > 0)
+            map.put("start_tk_rate", filter.getStartTkRate() + "");
+
+        if (filter.getEndTkRate() > 0)
+            map.put("end_tk_rate", filter.getEndTkRate() + "");
+
+        if (filter.getStartKaTkRate() > 0)
+            map.put("start_ka_tk_rate", filter.getStartKaTkRate() + "");
+
+        if (filter.getEndKaTkRate() > 0)
+            map.put("end_ka_tk_rate", filter.getEndKaTkRate() + "");
+
+        if (filter.isTmall())
+            map.put("is_tmall", filter.isTmall() + "");
+
+        if (filter.isOverseas())
+            map.put("is_overseas", filter.isOverseas() + "");
+
+        if (filter.isBaoYou())
+            map.put("need_free_shipment", filter.isBaoYou() + "");
+
+        if (filter.isNeedPrepay())
+            map.put("need_prepay", filter.isNeedPrepay() + "");
+
+        if (filter.isIncludePayRate30())
+            map.put("include_pay_rate_30", filter.isIncludePayRate30() + "");
+
+        if (filter.isIncludeGoodRate())
+            map.put("include_good_rate", filter.isIncludeGoodRate() + "");
+
+        if (filter.isIncludeRfdRate())
+            map.put("include_rfd_rate", filter.isIncludeRfdRate() + "");
+
+        if (filter.getStartDsr() > 0)
+            map.put("start_dsr", filter.getStartDsr() + "");
+
+        if (filter.getNpxLevel() > 0)
+            map.put("npx_level", filter.getNpxLevel() + "");
+
+        if (!StringUtil.isNullOrEmpty(filter.getCateIds()))
+            map.put("cat", filter.getCateIds());
+
+        if (!StringUtil.isNullOrEmpty(filter.getKey()))
+            map.put("q", filter.getKey());
+
+        if (filter.getQuan() > 0)
+            map.put("has_coupon", true + "");
+
+        if (!StringUtil.isNullOrEmpty(filter.getIp()))
+            map.put("ip", filter.getIp());
+
+        if (filter.getSort() > 0) {
+            if (filter.getSort() == TaoBaoUtil.SORT_SALE_HIGH_TO_LOW) {
+                map.put("sort", "total_sales_des"); // 閿�閲忎粠楂樺埌浣�
+            } else if (filter.getSort() == TaoBaoUtil.SORT_SALE_LOW_TO_HIGH) {
+                map.put("sort", "total_sales_asc"); // 閿�閲忎粠浣庡埌楂�
+            } else if (filter.getSort() == TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW) {
+                map.put("sort", "price_des"); // 浠锋牸浠庨珮鍒颁綆
+            } else if (filter.getSort() == TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH) {
+                map.put("sort", "price_asc"); // 浠锋牸浠庝綆鍒伴珮
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW) {
+                map.put("sort", "tk_rate_des"); // 娣樺浣i噾姣旂巼楂樺埌浣�
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TKRATE_LOW_TO_HIGH) {
+                map.put("sort", "tk_rate_asc"); // 娣樺浣i噾姣旂巼浣庡埌楂�
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TOTAL_COMMI_HIGH_TO_LOW) {
+                map.put("sort", "tk_total_commi_des"); // 鎬绘敮鍑轰剑閲戦珮鍒颁綆
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TOTAL_COMMI_LOW_TO_HIGH) {
+                map.put("sort", "tk_total_commi_asc"); // 鎬绘敮鍑轰剑閲戜綆鍒伴珮
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TOTAL_SALES_HIGH_TO_LOW) {
+                map.put("sort", "tk_total_sales_des"); // 绱鎺ㄥ箍閲忛珮鍒颁綆
+            } else if (filter.getSort() == TaoBaoUtil.SORT_TOTAL_SALES_LOW_TO_HIGH) {
+                map.put("sort", "tk_total_sales_asc"); // 绱鎺ㄥ箍閲忎綆鍒伴珮
+            }
+
+        }
+
+        String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+        System.out.println("resultStr" + resultStr);
+        JSONObject data = JSONObject.fromObject(resultStr);
+        JSONObject rootData = data.optJSONObject("tbk_dg_material_optional_upgrade_response");
+        if (rootData != null
+                && rootData.optJSONObject("result_list") != null) {
+            JSONArray array = rootData.optJSONObject("result_list")
+                    .optJSONArray("map_data");
+            List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+            if (array != null) {
+                for (int i = 0; i < array.size(); i++) {
+                    TaoBaoGoodsBrief goods = parseWuLiaoItemNew(array.optJSONObject(i));
+                    if (goods != null)
+                        goodsList.add(goods);
+                }
+            }
+            taoBaoSearchResult.setTaoBaoGoodsBriefs(goodsList);
+            int totalResults = rootData.getInt("total_results");
             int totalPage = totalResults % pageEntity.getPageSize() == 0 ? totalResults / pageEntity.getPageSize()
                     : totalResults / pageEntity.getPageSize() + 1;
             pageEntity.setTotalCount(totalResults);
@@ -832,6 +1008,7 @@
             provcity = provcity.split(" ")[provcity.split(" ").length - 1];
         TaoBaoSearchResult taoBaoSearchResult = new TaoBaoSearchResult();
         Map<String, String> map = new HashMap<>();
+        //TODO 涓存椂鎺ュ彛 taobao.tbk.dg.material.optional
         map.put("method", "taobao.tbk.dg.material.optional");
         map.put("page_size", 50 + "");
         map.put("page_no", 1 + "");
@@ -852,6 +1029,7 @@
         String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
         System.out.println(resultStr);
         JSONObject data = JSONObject.fromObject(resultStr);
+        //TODO 涓存椂鎺ュ彛 tbk_dg_material_optional_response
         if (data.optJSONObject("tbk_dg_material_optional_response") != null
                 && data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list") != null) {
             JSONArray array = data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list")
@@ -919,6 +1097,7 @@
         }
 
         String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+        System.out.println(resultStr);
         JSONObject data = JSONObject.fromObject(resultStr);
         if (data.optJSONObject("tbk_dg_material_optional_response") != null
                 && data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list") != null) {
@@ -948,7 +1127,7 @@
     }
 
     // 瑙f瀽鐗╂枡
-    private static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) {
+    public static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) {
         TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
         goods.setPictUrl(item.optString("pict_url"));
 
@@ -956,9 +1135,13 @@
             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"));
+        if (item.containsKey("annual_vol")) {
+            goods.setBiz30day(item.optInt("annual_vol") / 100);
+        } else {
+            goods.setBiz30day(item.optInt("volume"));
+        }
         goods.setCouponInfo(item.optString("coupon_info"));
 
         if (goods.getCouponInfo() != null)
@@ -1042,6 +1225,113 @@
         return goods;
     }
 
+    public static TaoBaoGoodsBrief parseWuLiaoItemNew(JSONObject item) {
+        JSONObject basicInfo = item.optJSONObject("item_basic_info");
+        JSONObject pricePromotionInfo = item.optJSONObject("price_promotion_info");
+        JSONObject publishInfo = item.optJSONObject("publish_info");
+        // 绾挎姤鍐呭
+        JSONObject mgcInfo = item.optJSONObject("mgc_info");
+
+
+        TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+        goods.setPictUrl(basicInfo.optString("pict_url"));
+
+        if (!StringUtil.isNullOrEmpty(basicInfo.optString("white_image"))) {
+            goods.setPictUrlWhite(basicInfo.optString("white_image"));
+        }
+
+        goods.setAuctionId(item.optString("item_id"));
+        goods.setAuctionUrl("https:" + item.optString("url"));
+
+        if (basicInfo.containsKey("annual_vol")) {
+            goods.setBiz30day(basicInfo.optInt("annual_vol") / 12);
+        } else {
+            goods.setBiz30day(basicInfo.optInt("volume"));
+        }
+        if (pricePromotionInfo.optJSONObject("final_promotion_path_list") != null && pricePromotionInfo.optJSONObject("final_promotion_path_list").optJSONArray("final_promotion_path_map_data").size() > 0) {
+            JSONArray array = pricePromotionInfo.optJSONObject("final_promotion_path_list").optJSONArray("final_promotion_path_map_data");
+            JSONObject couponInfo = array.optJSONObject(0);
+            goods.setCouponInfo(couponInfo.optString("promotion_desc").replace(".00", ""));
+            List<BigDecimal> quanInfo = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
+            goods.setCouponAmount(new BigDecimal(couponInfo.optString("promotion_fee")));
+            goods.setCouponEffectiveEndTime(couponInfo.optString("promotion_end_time"));
+            goods.setCouponEffectiveStartTime(couponInfo.optString("promotion_start_time"));
+            goods.setCouponStartFee(quanInfo.get(0));
+            goods.setCouponLeftCount(100);
+            goods.setCouponLink(publishInfo.optString("coupon_share_url"));
+            goods.setCouponTotalCount(100);
+            goods.setCouponActivityId(couponInfo.optString("promotion_id"));
+        } else {
+            goods.setCouponAmount(new BigDecimal(0));
+        }
+
+        goods.setDayLeft(-1);
+        if (basicInfo.optJSONObject("small_images") != null) {
+            JSONArray imgArray = basicInfo.optJSONObject("small_images").optJSONArray("string");
+            if (imgArray != null) {
+                List<String> imgList = new ArrayList<>();
+                for (int n = 0; n < imgArray.size(); n++) {
+                    imgList.add(imgArray.optString(n));
+                }
+                goods.setImgList(imgList);
+            }
+        }
+
+        if (publishInfo.optString("commission_type").contains("MKT"))
+            goods.setTkMktStatus("1");
+        else
+            goods.setTkMktStatus("0");
+
+        if (publishInfo.optString("commission_type").contains("SP"))
+            goods.setIncludeDxjh(1);
+
+        goods.setSellerId(basicInfo.optLong("seller_id"));
+        goods.setShopTitle(basicInfo.optString("shop_title"));
+        goods.setTitle(basicInfo.optString("title"));
+        goods.setProvcity(basicInfo.optString("provcity"));
+
+        if (!StringUtil.isNullOrEmpty(basicInfo.optString("level_one_category_id"))) {
+            goods.setRootCatId(basicInfo.optInt("level_one_category_id"));
+        }
+        goods.setRootCategoryName(basicInfo.optString("level_one_category_name"));
+
+        if (!StringUtil.isNullOrEmpty(basicInfo.optString("category_id"))) {
+            goods.setLeafCatId(basicInfo.optInt("category_id"));
+        }
+        goods.setLeafName(basicInfo.optString("category_name"));
+
+        goods.setTkRate(new BigDecimal(publishInfo.optString("income_rate")));
+        goods.setTotalNum(1000);
+        goods.setUserType(basicInfo.optInt("user_type"));
+        goods.setUserTypeName("");
+        goods.setZkPrice(new BigDecimal(pricePromotionInfo.optString("zk_final_price")));
+
+        if (publishInfo.optJSONArray("sp_campaign_list") != null && publishInfo.optJSONArray("sp_campaign_list").size() > 0) {
+            goods.setDxjhInfo(publishInfo.optJSONArray("sp_campaign_list").optJSONObject(0).optString("sp_name"));
+        }
+
+        if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {// 鏃犲埜
+            goods.setTkCommFee(goods.getZkPrice().multiply(goods.getTkRate()).divide(new BigDecimal(100)));
+        } else if (goods.getZkPrice().compareTo(goods.getCouponStartFee()) >= 0// 鏈夊埜
+                && goods.getZkPrice().compareTo(goods.getCouponAmount()) >= 0) {
+            BigDecimal finalPrice = goods.getZkPrice().subtract(goods.getCouponAmount());
+            goods.setTkCommFee(finalPrice.multiply(goods.getTkRate()).divide(new BigDecimal(100)));
+        } else {
+            goods.setTkCommFee(new BigDecimal(0));
+        }
+        if (!StringUtil.isNullOrEmpty(pricePromotionInfo.optString("reserve_price")))
+            goods.setReservePrice(new BigDecimal(pricePromotionInfo.optString("reserve_price")));
+        goods.setTotalFee(new BigDecimal("0"));
+        // 鎺ㄨ崘璇�
+
+        if (mgcInfo != null) {
+            goods.setDescription(mgcInfo.optString("item_description"));
+        }
+        goods = loadYuShouInfo(goods, item);
+        return goods;
+    }
+
+
     /**
      * 鑾峰彇娣樺彛浠�
      *
@@ -1104,7 +1394,7 @@
      * @param activityId
      * @return
      */
-    public static QuanInfo getQuanInfo(Long auctionId, String activityId) {
+    public static QuanInfo getQuanInfo(String auctionId, String activityId) {
         QuanInfo info = new TaoKeApiUtil.QuanInfo();
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.coupon.get");
@@ -1167,7 +1457,7 @@
                     if (url.contains("s.click.taobao.com/t?e=m")) {
                         TaoBaoGoodsBrief goods;
                         try {
-                            goods = searchGoodsDetail(item.optLong("num_iid"));
+                            goods = searchGoodsDetail(item.optString("num_iid"));
                             if (goods != null)
                                 goodsList.add(goods);
                         } catch (TaobaoGoodsDownException e) {
@@ -1369,7 +1659,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");
@@ -1540,32 +1830,6 @@
         return result;
     }
 
-    /**
-     * 浠庢窐瀹濋摼鎺ヤ腑瑙f瀽鍟嗗搧ID锛堥珮绾ф帴鍙o級
-     *
-     * @param link
-     * @return
-     */
-    public static String parseAuctionIdFromLink(String link) {
-        Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.item.click.extract");
-        map.put("click_url", link + "");
-
-        TaoKeAppInfo app = new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
-                TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
-        JSONObject resultJSON = null;
-        try {
-            resultJSON = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(resultJSON);
-        } catch (TaoKeApiException e) {
-            e.printStackTrace();
-        }
-        if (resultJSON == null)
-            return null;
-
-        return null;
-
-    }
 
     public static String getAccessToken(String code, String appKey, String appSecret) {
         Map<String, String> map = new HashMap<>();
@@ -1728,7 +1992,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<>();
@@ -1745,7 +2009,7 @@
         }
     }
 
-    public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app, String specialId, String relationId) {
+    public static TaoBaoGoodsBrief specialConvertCoupon(String auctionId, TaoKeAppInfo app, String specialId, String relationId) {
         String pid = app.getPid();
         String[] sts = pid.split("_");
         Map<String, String> map = new HashMap<>();
@@ -1803,64 +2067,62 @@
         return null;
     }
 
-    public static void juHuaSuan() {
+
+    public static TaoBaoGoodsBrief specialConvertCouponV2(String auctionId, TaoKeAppInfo app, String specialId, String relationId) {
+        String pid = app.getPid();
+        String[] sts = pid.split("_");
         Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.ju.items.search");
-        map.put("current_page", 1 + "");
-        map.put("page_size", 100 + "");
-        map.put("pid", "mm_124933865_43788020_381938426");
-
-        TaoKeAppInfo app = new TaoKeAppInfo();
-        app.setAppKey("24838852");
-        app.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");
-
+        map.put("method", "taobao.tbk.dg.general.link.convert");
+        map.put("item_id_list", auctionId + "");
+        map.put("adzone_id", sts[3]);
+        if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
+            map.put("special_id", specialId);
+        } else if (!StringUtil.isNullOrEmpty(specialId)) {
+            map.put("special_id", specialId);
+        } else if (!StringUtil.isNullOrEmpty(relationId)) {
+            map.put("relation_id", relationId);
+        }
         try {
-            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(json);
-        } catch (TaoKeApiException e) {
+            String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+            System.out.println(result);
+            JSONObject json = JSONObject.fromObject(result);
+            JSONObject resultJSON = json.optJSONObject("tbk_dg_general_link_convert_response").optJSONObject("data")
+                    .optJSONObject("item_url_list").optJSONArray("item_url_list").optJSONObject(0);
+            JSONObject goodsInfo=resultJSON.optJSONObject("link_info_dto");
+            String couponLink = goodsInfo.optString("coupon_short_url");
+            String itemLink = goodsInfo.optString("cps_short_url");
+            TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+            goods.setAuctionUrl(itemLink);
+            goods.setCouponLink(couponLink);
+            if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info"))) {
+                goods.setCouponLink(couponLink);
+                goods.setCouponInfo(resultJSON.optString("coupon_info"));
+                if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_total_count"))) {
+                    goods.setCouponTotalCount(Integer.parseInt(resultJSON.optString("coupon_total_count")));
+                }
+
+                if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_remain_count"))) {
+                    goods.setCouponLeftCount(Integer.parseInt(resultJSON.optString("coupon_remain_count")));
+                }
+
+                goods.setCouponEffectiveStartTime(resultJSON.optString("coupon_start_time"));
+                goods.setCouponEffectiveEndTime(resultJSON.optString("coupon_end_time"));
+
+            }
+
+            JSONObject rateInfo=resultJSON.optJSONObject("promotion_info_dto");
+            String tkRate = rateInfo.optString("commission_rate");
+            if (!StringUtil.isNullOrEmpty(tkRate)) {
+                goods.setTkRate(new BigDecimal(tkRate));
+            }
+            goods = loadYuShouInfo(goods, resultJSON);
+            return goods;
+        } catch (Exception e) {
             e.printStackTrace();
         }
-
+        return null;
     }
 
-    public static void taoKeContent() {
-        Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.content.get");
-        map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT.split("_")[3]);
-        map.put("type", "1");
-        map.put("count", "100");
-
-        TaoKeAppInfo app = new TaoKeAppInfo();
-        app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
-        app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-        try {
-            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(json);
-        } catch (TaoKeApiException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void taoKeContentSource(String contentId, String source) {
-        Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.dg.optimus.material");
-        map.put("adzone_id", TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
-        map.put("page_size", "10");
-        map.put("page_no", "1");
-        map.put("content_id", contentId);
-        map.put("content_source", source);
-        map.put("material_id", "1");
-
-        TaoKeAppInfo app = new TaoKeAppInfo();
-        app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
-        app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-        try {
-            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(json);
-        } catch (TaoKeApiException e) {
-            e.printStackTrace();
-        }
-    }
 
     // AA5ISJ
 
@@ -1868,9 +2130,13 @@
         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 (item.containsKey("annual_vol")) {
+            goods.setBiz30day(item.optInt("annual_vol") / 12);
+        } else {
+            goods.setBiz30day(item.optInt("volume"));
+        }
         if (!StringUtil.isNullOrEmpty(item.optString("coupon_amount"))) {
             goods.setCouponEffectiveEndTime(TimeUtil.getGernalTime(item.optLong("coupon_end_time"), "yyyy-MM-dd"));
             goods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(item.optLong("coupon_start_time"), "yyyy-MM-dd"));
@@ -1973,55 +2239,17 @@
         }
     }
 
-    public static void getTaoKeContentEffective() {
-        Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.dg.optimus.material");
-        map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID.split("_")[3]);
-        map.put("page_no", "1");
-        map.put("page_size", "20");
-        map.put("content_id", "8872035");
-
-        TaoKeAppInfo app = new TaoKeAppInfo();
-        app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
-        app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-        try {
-            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(json);
-        } catch (TaoKeApiException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public static void getTaoKeContent() {
-        Map<String, String> map = new HashMap<>();
-        map.put("method", "taobao.tbk.content.get");
-        map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID.split("_")[3]);
-        map.put("type", "1");
-
-        TaoKeAppInfo app = new TaoKeAppInfo();
-        app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
-        app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-        try {
-            JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-            System.out.println(json);
-        } catch (TaoKeApiException e) {
-            e.printStackTrace();
-        }
-
-    }
-
     /**
      * 娣樺彛浠よ浆鍟嗗搧ID
      *
      * @param token
      * @return
      */
-    public static Long tokenConvertAuctionId(String token) throws TaoBaoTokenParseException {
+    public static TokenConvertResult tokenConvert(String token) throws TaoBaoTokenParseException {
         Map<String, String> map = new HashMap<>();
         map.put("method", "taobao.tbk.tpwd.convert");
         map.put("password_content", token);
-        map.put("adzone_id", TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
+        map.put("adzone_id", TaoBaoConstant.TAOBAO_PID_DEFAULT.split("_")[3]);
         TaoKeAppInfo app = new TaoKeAppInfo();
         app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
         app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
@@ -2031,7 +2259,10 @@
             System.out.println(json.toString());
 
             try {
-                return json.optJSONObject("tbk_tpwd_convert_response").optJSONObject("data").optLong("num_iid");
+                JSONObject data = json.optJSONObject("tbk_tpwd_convert_response").optJSONObject("data");
+                Gson gson = new Gson();
+
+                return gson.fromJson(data.toString(), TokenConvertResult.class);
             } catch (Exception e) {
 
                 return null;
@@ -2051,10 +2282,11 @@
         return null;
     }
 
+
     // 娣樼ぜ閲戝垱寤�
     //{"result":{"msg_code":"FAIL_CHECK_ITEM_DAILY_SEND_NUM_CHECK_ERROR","msg_info":"浠婃棩璇ュ晢鍝佹窐绀奸噾鍒涘缓鏁板凡瓒呬笂闄愶紝璇锋偍鏄庢棩鍐嶈瘯","success":false},"request_id":"10p30v02qadkq"}
     //{"result":{"msg_code":"ASSET_ACCOUNT_BALANCE_NOT_ENOUGH","msg_info":"璐︽埛棰勭畻涓嶈冻","success":false},"request_id":"5caz9izr7jqp"}
-    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<>();
@@ -2117,11 +2349,18 @@
         return null;
     }
 
-    // 娣樼ぜ閲戞姤鍛�
-    public static UserTaoLiJinReport getTaoLiJinEffective(String rightsId) {
+    /**
+     * @return com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport
+     * @author hxh
+     * @description 娣樼ぜ閲戞姤鍛� 鎺ュ彛鏂囨。锛歨ttps://open.taobao.com/api.htm?source=search&docId=58736&docType=2
+     * @date 10:57 2022/1/11
+     * @param: 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);
@@ -2132,27 +2371,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) {
@@ -2161,11 +2397,11 @@
         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 + "");
-        map.put("pid", TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+        map.put("pid", TaoBaoConstant.TAOBAO_PID_DEFAULT);
         map.put("num_iids", auctionId + "");
         TaoKeAppInfo app = new TaoKeAppInfo();
         app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
@@ -2179,7 +2415,7 @@
     }
 
     /**
-     * 鑾峰彇娣樺疂绯荤粺鏃堕棿
+     * 鑾峰彇娣樺疂绯荤粺鏃堕棿(鏀惰垂API锛岃皑鎱庤皟鐢�)
      *
      * @return
      */
@@ -2194,6 +2430,7 @@
             e.printStackTrace();
         }
         return null;
+
     }
 
     /**
@@ -2232,7 +2469,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 + "");
@@ -2265,18 +2502,18 @@
         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 + "");
         map.put("num_iids", auctionId + "");
-        map.put("pid", TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+        map.put("pid", TaoBaoConstant.TAOBAO_PID_DEFAULT);
 
         List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
         JSONObject resultJSON = null;
         try {
             resultJSON = TaoKeBaseUtil.baseRequest(map, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
-                    TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+                    TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_PID_DEFAULT));
 
             JSONObject response = resultJSON.optJSONObject("tbk_dg_optimus_material_response");
             if (response != null && response.optJSONObject("result_list") != null) {
@@ -2340,6 +2577,88 @@
         public BigDecimal coupon_start_fee;// 鍒歌捣濮嬮噾棰�
     }
 
+    public static class TokenConvertResult {
+        private String num_iid;//	鍟嗗搧Id
+        private String click_url;//鍟嗗搧娣樺杞摼
+        private String seller_id;//搴楅摵鍗栧ID
+        private String origin_url;//鍏ュ弬娣樺彛浠ゅ搴斿師濮嬮摼鎺�
+        private String origin_pid;//鍏ュ弬娣樺彛浠ゆ帹骞块摼鎺ヤ腑鐨刾id锛屽鏋滀笉灞炰簬褰撳墠璋冪敤鐨勬帹骞胯�呭垯灞曠ず鈥�0鈥�
+
+        public String getNum_iid() {
+            return num_iid;
+        }
+
+        public void setNum_iid(String num_iid) {
+            this.num_iid = num_iid;
+        }
+
+        public String getClick_url() {
+            return click_url;
+        }
+
+        public void setClick_url(String click_url) {
+            this.click_url = click_url;
+        }
+
+        public String getSeller_id() {
+            return seller_id;
+        }
+
+        public void setSeller_id(String seller_id) {
+            this.seller_id = seller_id;
+        }
+
+        public String getOrigin_url() {
+            return origin_url;
+        }
+
+        public void setOrigin_url(String origin_url) {
+            this.origin_url = origin_url;
+        }
+
+        public String getOrigin_pid() {
+            return origin_pid;
+        }
+
+        public void setOrigin_pid(String origin_pid) {
+            this.origin_pid = origin_pid;
+        }
+    }
+
+    public static void main(String[] args) throws TaoBaoTokenParseException, TaobaoGoodsDownException {
+//        SearchFilter sf =new SearchFilter();
+//        sf.setKey("https://s.click.taobao.com/HCsB7Du");
+//        sf.setPageSize(10);
+//        sf.setPage(1);
+//        searchWuLiao(sf,null,null);
+//        tokenConvert("銆愭窐瀹濄�慼ttps://m.tb.cn/h.5YFsc7F?tk=A8wSdGRxsjm CZ0001 銆屼縿缃楁柉椋庡懗杩蜂綘鎻愭媺绫宠嫃铚傝湝濂舵补鍗冨眰鐢滃搧铔嬬硶鏃╅鏁寸3000鍏嬮浂椋熴�峔n" +
+//                "鐐瑰嚮閾炬帴鐩存帴鎵撳紑 鎴栬�� 娣樺疂鎼滅储鐩存帴鎵撳紑");
+//
+//     TaoBaoGoodsBrief goods =  getSimpleGoodsInfo("kNWkWZuYt28BaNcG9ycPtJ-aRG5QXwIdOXvv5bNcNq");
+//     System.out.println(goods);
+//     System.out.println(goods.getAuctionId());
+//        Map<String, String> map = new HashMap<>();
+//        map.put("method", "taobao.tbk.item.info.get");
+//        map.put("biz_scene_id", "2");
+//        map.put("num_iids",  "708395859317");
+//        String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+//        System.out.println(resultStr);
+//        SearchFilter sf=new SearchFilter();
+//        sf.setKey("闉�");
+//        sf.setPage(1);
+//        sf.setPageSize(20);
+//        TaoBaoSearchResult result =  searchWuLiaoNew(sf,null,null);
+//        System.out.printf(result.toString());
+//        public static final String TAOBAO_AUTH_APPKEY = "24980167";
+//        public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+//        public static final String TAOBAO_PID_DEFAULT="mm_124933865_56750082_89555600043";
+
+
+        TaoKeAppInfo app = new TaoKeAppInfo("24980167", "e0a2e05deabf5ce039b52e5b492d5382", "mm_124933865_56750082_89555600043");
+
+        specialConvertCouponV2("ZMxBywvT6tPr0wabjaFBQPiVt6-g4DYZPC2OoJaaRXIoq", app, "511379263", null);
+    }
+
 }
 
 

--
Gitblit v1.8.0