Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java

@@ -17,6 +17,7 @@
import org.yeshi.utils.StringUtil;



import com.google.gson.Gson;

import com.yeshi.fanli.dto.vip.VIPSearchFilter;

import com.yeshi.fanli.dto.vip.VIPSearchResult;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;



@@ -113,14 +114,31 @@
      return null;

   }



   public static VIPSearchResult search() {

   /**

    * 搜索

    * @Title: search

    * @Description: 
    * @param searchFilter

    * @return 
    * VIPSearchResult 返回类型

    * @throws

    */

   public static VIPSearchResult search(VIPSearchFilter searchFilter) {

      Map<String, String> taskParams = new HashMap<>();

      taskParams.put("keyword", "夹克 男士 带帽");

      taskParams.put("page", "1");

      taskParams.put("pageSize", "20");

      taskParams.put("requestId", UUID.randomUUID() + "");

      // taskParams.put("priceStart", "");

      // taskParams.put("priceEnd", "");

      taskParams.put("keyword", searchFilter.getKeyword());

      taskParams.put("page", searchFilter.getPage() + "");

      taskParams.put("pageSize", searchFilter.getPageSize() + "");

      taskParams.put("requestId", System.currentTimeMillis() + "_" + UUID.randomUUID());

      if (searchFilter.getPriceStart() != null)

         taskParams.put("priceStart", searchFilter.getPriceStart());



      if (searchFilter.getPriceEnd() != null)

         taskParams.put("priceEnd", searchFilter.getPriceEnd());

      if (searchFilter.getOrder() != null)

         taskParams.put("order", searchFilter.getOrder() + "");

      if (searchFilter.getFieldName() != null)

         taskParams.put("fieldName", searchFilter.getFieldName() + "");



      JSONObject root = new JSONObject();

      root.put("request", JSONObject.fromObject(taskParams));

      String result = baseRequest("com.vip.adp.api.open.service.UnionGoodsService", "query", root);

@@ -153,7 +171,7 @@
      goodsIdArray.add(goodsId);

      taskParams.put("goodsIdList", goodsIdArray);

      taskParams.put("chanTag", tag);

      taskParams.put("requestId", UUID.randomUUID() + "");

      taskParams.put("requestId", System.currentTimeMillis() + "_" + UUID.randomUUID());

      String result = baseRequest("com.vip.adp.api.open.service.UnionUrlService", "genByGoodsId",

            JSONObject.fromObject(taskParams));

      System.out.println(result);