Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -10,12 +10,14 @@
import java.util.regex.Pattern;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

@@ -27,29 +29,36 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.TokenRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.user.HistorySearchService;

import com.yeshi.fanli.service.inter.user.TokenRecordService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.cache.IntegralGetCacheManager;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

@@ -57,8 +66,10 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;

import com.yeshi.fanli.util.taobao.SearchFilterUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.brand.TaoBaoShopVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.msg.TokenVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -99,12 +110,19 @@


   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

	


   @Resource(name = "taskExecutor")

   private TaskExecutor executor;



	
	
   @Resource

   private TokenRecordService tokenRecordService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   /**

    * 粘贴板信息推荐

    * 

@@ -113,16 +131,24 @@
    *            商品链接

    * @param out

    */

   @RequestMapping(value = "getNewGoodsInfo", method = RequestMethod.POST)

   public void getNewGoodsInfo(AcceptData acceptData, String text, PrintWriter out) {

   @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)

   public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) {

      if (StringUtil.isNullOrEmpty(text)) {

         out.print(JsonUtil.loadFalseResult("值为空"));

         return;

      }

      // 去除前后空格

      text = text.trim();



      if (text.length() > 256) {

         out.print(JsonUtil.loadFalseResult("值过长"));

      try {

         TokenVO tokenVO = tokenRecordService.discernToken(text, uid);

         out.print(JsonUtil.loadTrueResult(tokenVO));

         return;

      } catch (TokenRecordException e) {

         if (e.getCode() == 1001) { // 需要用户登录

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

            return;

         }

      }



      TaoBaoGoodsBrief tb = null;

@@ -131,13 +157,14 @@
      Pattern p = Pattern.compile(URL_REGEX);

      Matcher matcher = p.matcher(text);

      if (!matcher.find()) {// 不包含链接

         // 商品详情

         // 发现

         // 没有链接，标题过长也不处理

         if (text.startsWith("【") && text.contains("】")) {

            int end = text.indexOf("】");

            if (end > 2)

               text = text.substring(1, end);

         if (text.length() > 256) {

            out.print(JsonUtil.loadFalseResult("值过长"));

            return;

         }

         String pattern = "^[A-Za-z0-9-]+$";

         if (Pattern.matches(pattern, text.replace(" ", ""))) {// 删除空格

            out.println(JsonUtil.loadFalseResult("不支持推荐"));

            return;

         }



         LogHelper.test("根据粘贴板推荐:" + text);

@@ -147,41 +174,30 @@
            return;

         }



         SearchFilter sf = new SearchFilter();

         sf.setKey(text);

         JSONObject root = new JSONObject();



         TaoBaoSearchResult result = TaoBaoUtil.search(sf);

         if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0)

            for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

               // 是属于淘宝联盟商品

               if (goods.getTitle().equalsIgnoreCase(text)) {

                  root.put("type", 2);

                  JSONObject data = new JSONObject();

                  data.put("title", goods.getTitle());

                  root.put("data", data);

                  out.print(JsonUtil.loadTrueResult(root));

                  return;

               }

            }



         // 查询大淘客标题

         List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);

         if (list != null && list.size() > 0) {

            root.put("type", 2);

            JSONObject data = new JSONObject();

            data.put("title", list.get(0).getdTitle());

            root.put("data", data);

            out.print(JsonUtil.loadTrueResult(root));

         if (analysisTaoToken(text, out)) {

            return;

         }



         out.print(JsonUtil.loadFalseResult("暂不支持该类型！"));

         JSONObject root = new JSONObject();



         root.put("type", 2);

         JSONObject data = new JSONObject();

         data.put("title", text);

         root.put("data", data);

         out.print(JsonUtil.loadTrueResult(root));

         return;

      }



      CommonGoods commonGoods = null;

      text = matcher.group();

      if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 聚划算



      if (text.startsWith("https://a.m.taobao.com/i"))// 淘宝账号未登录状态

      {

         text = text.substring("https://a.m.taobao.com/i".length(), text.indexOf(".htm"));

         if (NumberUtil.isNumeric(text)) {

            tb = TaoBaoUtil.isAlimama(text);

         }

      } else if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 聚划算

         int index = text.indexOf("item_id");

         if (index < 0) {

            out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

@@ -212,34 +228,143 @@
         }

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

            if (!StringUtil.isNullOrEmpty(jdId)) {

               JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

               if (goods != null)

                  commonGoods = CommonGoodsFactory.create(goods);

            } else {

               String pddId = PinDuoDuoUtil.getPDDGoodsId(text);

               if (!StringUtil.isNullOrEmpty(pddId)) {

                  PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));

                  if (goods != null)

                     commonGoods = CommonGoodsFactory.create(goods);

               }

            }

         }

      }



      if (tb == null) {

      if (tb == null && commonGoods == null) {

         out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

         return;

      }



      JSONObject data = new JSONObject();

      JSONObject taoBaoGoodsJSON = new JSONObject();

      taoBaoGoodsJSON.put("title", tb.getTitle());

      taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());

      taoBaoGoodsJSON.put("auctionId", tb.getAuctionId());

      taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());

      data.put("taoBaoGoodsBrief", taoBaoGoodsJSON);

      if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {

         if (tb.getImgList() == null)

            tb.setImgList(new ArrayList<>());

         tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));



      if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

         if (tb != null) {

            TaoBaoGoodsBrief goodsBrief = null;

            try {

               goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }

            if (goodsBrief == null) {

               out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

               return;

            }

            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         data.put("type", 3);

         data.put("goods",

               gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

         out.print(JsonUtil.loadTrueResult(data));

         return;

      }

      data.put("tbImgs", tb.getImgList());



      if (tb != null) {

         commonGoods = new CommonGoods();

         commonGoods.setPrice(tb.getZkPrice());

         commonGoods.setTitle(tb.getTitle());

         commonGoods.setGoodsId(tb.getAuctionId());

         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         commonGoods.setPicture(tb.getPictUrl());

      }



      JSONObject taoBaoGoodsJSON = new JSONObject();

      taoBaoGoodsJSON.put("title", commonGoods.getTitle());

      taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");

      taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());

      taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());

      if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

         taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {

         taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {

         taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());

      }

      data.put("goods", taoBaoGoodsJSON);

      List<String> picList = new ArrayList<>();

      picList.add(commonGoods.getPicture());

      data.put("imgs", picList);

      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);



      out.print(JsonUtil.loadTrueResult(root));

   }

	
	
	


   private boolean analysisTaoToken(String text, PrintWriter out) {

      String token = StringUtil.picUpTaoToken(text);

      if (!StringUtil.isNullOrEmpty(token)) {

         Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);

         if (auctionId != null) {

            TaoBaoGoodsBrief tb = null;

            try {

               tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }



            if (tb != null) {

               JSONObject data = new JSONObject();

               JSONObject taoBaoGoodsJSON = new JSONObject();

               taoBaoGoodsJSON.put("title", tb.getTitle());

               taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());

               taoBaoGoodsJSON.put("id", tb.getAuctionId());

               taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);

               taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());

               data.put("goods", taoBaoGoodsJSON);

               if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {

                  if (tb.getImgList() == null)

                     tb.setImgList(new ArrayList<>());

                  tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));

               }

               data.put("imgs", tb.getImgList());

               JSONObject root = new JSONObject();

               root.put("type", 1);

               root.put("data", data);

               out.print(JsonUtil.loadTrueResult(root));

               return true;

            }

         }

      }

      return false;

   }



   /**

    * 口令领取

    * 
    * @param acceptData

    * @param kw

    * @param goodsType

    * @param out

    */

   @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)

   public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {

      try {

         String msg = tokenRecordService.receiveToken(token, uid);

         out.print(JsonUtil.loadTrueResult(msg));

      } catch (TokenRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }



   /**

    * 搜索候选词

    * 

@@ -282,32 +407,52 @@
    * @param kw

    * @param page

    * @param filter

    * @param order      销量由高到低:1 、 价格从高到低:2 、 价格从低到高:3 、 推广量高到低:4（综合默认）、返利比高到低:5

    *                   、返利比低到高:6 、推荐20

    * @param order

    *            销量由高到低:1 、 价格从高到低:2 、 价格从低到高:3 、 推广量高到低:4（综合默认）、返利比高到低:5

    *            、返利比低到高:6 、推荐20

    * @param startprice

    * @param endprice

    * @param fastFilter

    * @param out

    */

   @RequestMapping(value = "searchGoods")

   public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter, Integer order, 
         PrintWriter out) {

      if (goodsType == null || goodsType < 1 || goodsType >3) {

   public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,

         Integer order, Long uid, HttpSession session, PrintWriter out) {



      if (goodsType == null || goodsType < 1 || goodsType > 3) {

         out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数"));

         return;

      }

		


      if (page == null || page < 1) {

         out.print(JsonUtil.loadFalseResult(1, "页码不能小于1"));

         return;

      }

		


      if (StringUtil.isNullOrEmpty(key)) {

         out.print(JsonUtil.loadFalseResult(1, "请输入搜索内容"));

         return;

      }

      final String searchkey = key.trim();

		


      if (uid != null) {

         if (page == 1) {

            integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());

         } else if (page > 1) {

            Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());

            if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览

               integralGetCacheManager.clearSearchTime(acceptData.getDevice());

               ThreadUtil.run(new Runnable() {

                  @Override

                  public void run() {

                     // 增加金币

                     integralGetService.addSearchResultScan(uid, key);

                  }

               });

            }

         }

      }



      executor.execute(new Runnable() {

         @Override

         public void run() {

@@ -318,12 +463,11 @@
            String device = acceptData.getDevice();

            sb.append(platform).append(link).append(packages).append(link).append(device);

            String bid = StringUtil.Md5(sb.toString());

				


            // 加入搜索历史记录

            historySearchService.addHistorySearch(searchkey, bid);

         }

      });

		


      if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) {

         JSONObject data = new JSONObject();

@@ -333,19 +477,19 @@
         return;

      }



      /*--------- 京东商品  -------*/ 
      /*--------- 京东商品  -------*/

      if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) {

         searchJDGoods(searchkey, page, filter, order, out);

         return;

      }



      /*-------- 拼多多商品  -------*/ 
      /*-------- 拼多多商品  -------*/

      if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {

         searchPDDGoods(searchkey, page, filter, order, out);

         return;

      }



      /*-------- 淘宝商品  -------*/ 
      /*-------- 淘宝商品  -------*/

      searchTaoBaoGoods(searchkey, page, filter, order, out);

   }



@@ -376,25 +520,25 @@
         } else if (order == 4) { // 返利比高到低

            sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);

         }

      } 
		
      }



      if (!StringUtil.isNullOrEmpty(filter)) {

         JSONObject jsonfilter = JSONObject.fromObject(filter);

         Boolean coupon = jsonfilter.optBoolean("coupon");

         if (coupon != null && coupon) {

            sf.setQuan(1); // 有券

         }

			


         Boolean tmall = jsonfilter.optBoolean("tmall");

         if (tmall != null && tmall) {

            sf.setTmall(true); // 天猫

         }

			


         String minPrice = jsonfilter.optString("minPrice");

         if (!StringUtil.isNullOrEmpty(minPrice)) {

            sf.setStartPrice(new BigDecimal(minPrice));

         }

			


         String maxPrice = jsonfilter.optString("maxPrice");

         if (!StringUtil.isNullOrEmpty(maxPrice)) {

            sf.setEndPrice(new BigDecimal(maxPrice));

@@ -406,10 +550,10 @@
      if (page == 1) {

         daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);

      }

		


      // 淘宝api搜索商品

      TaoBaoSearchResult result = TaoBaoUtil.search(sf);

		


      // 搜索是否在营销主商品库

      if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {

         ThreadUtil.run(new Runnable() {

@@ -421,7 +565,7 @@
            }

         });

      }

		


      List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;

      if (result != null) {

         taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();

@@ -429,7 +573,7 @@
      if (taoBaoGoodsBriefs == null) {

         taoBaoGoodsBriefs = new ArrayList<>();

      }

	


      if (daTaoKeList != null && daTaoKeList.size() > 0) {

         try {

            Collections.reverse(daTaoKeList);

@@ -439,7 +583,7 @@
         } catch (Exception e) {

         }

      }

		


      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

@@ -449,7 +593,7 @@


      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().create();

		


      JSONObject data = new JSONObject();

      data.put("result", gson.toJson(list));

      data.put("count", result.getTaoBaoHead().getDocsfound());

@@ -465,7 +609,6 @@
      out.print(JsonUtil.loadTrueResult(data));

   }





   /**

    * 京东

    * 

@@ -478,7 +621,7 @@
    * @return

    */

   private void searchJDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {

		


      JDSearchResult result = null;

      String way = configService.get("jd_api_search_key");

      if ("1".equals(way)) {

@@ -511,31 +654,29 @@
            }

         }





         if (!StringUtil.isNullOrEmpty(filter)) {

            JSONObject jsonfilter = JSONObject.fromObject(filter);

            Boolean coupon = jsonfilter.optBoolean("coupon");

            if (coupon != null && coupon) {

               filterAPI.setIsCoupon(1); // 有券

            }

				


            Boolean zy = jsonfilter.optBoolean("zy");

            if (zy != null && zy) {

               filterAPI.setOwner("g"); // 自营

            }

				
				


            String minPrice = jsonfilter.optString("minPrice");

            if (!StringUtil.isNullOrEmpty(minPrice)) {

               filterAPI.setPricefrom(Double.parseDouble(minPrice));

            }

				


            String maxPrice = jsonfilter.optString("maxPrice");

            if (!StringUtil.isNullOrEmpty(maxPrice)) {

               filterAPI.setPriceto(Double.parseDouble(maxPrice));

            }

         }

			


         result = JDApiUtil.queryByKey(filterAPI);

      } else {

         // 网页爬取

@@ -574,39 +715,39 @@
            if (coupon != null && coupon) {

               jdfilter.setHasCoupon(1); // 有券

            }

				


            Boolean zy = jsonfilter.optBoolean("zy");

            if (zy != null && zy) {

               jdfilter.setIsZY(1); // 自营

            }

				


            Boolean delivery = jsonfilter.optBoolean("delivery");

            if (delivery != null && delivery) {

               jdfilter.setDeliveryType(1); // 京东配送

            }

				


            String minPrice = jsonfilter.optString("minPrice");

            if (!StringUtil.isNullOrEmpty(minPrice)) {

               if(minPrice.contains(".")) {

               if (minPrice.contains(".")) {

                  minPrice = minPrice.replace(".", "-");

                  minPrice = minPrice.split("-")[0];

               }

               jdfilter.setFromPrice(Integer.parseInt(minPrice));

            }

				


            String maxPrice = jsonfilter.optString("maxPrice");

            if (!StringUtil.isNullOrEmpty(maxPrice)) {

               if(maxPrice.contains(".")) {

               if (maxPrice.contains(".")) {

                  maxPrice = maxPrice.replace(".", "-");

                  maxPrice =  maxPrice.split("-")[0];

                  maxPrice = maxPrice.split("-")[0];

               }

               jdfilter.setToPrice(Integer.parseInt(maxPrice));

            }

         }

         result = JDUtil.searchByKey(jdfilter);

		


      }

		


      long count = 0;

      JSONObject data = new JSONObject();

      JSONArray array = new JSONArray();

@@ -623,8 +764,7 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                     shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

               array.add(gson.toJson(goodsDetailVO));

            }

         }

@@ -636,7 +776,7 @@
   }



   /**

    * 京东

    * 拼多多

    * 

    * @param kw

    * @param page

@@ -672,14 +812,14 @@
            break;

         }

      }

		


      if (!StringUtil.isNullOrEmpty(filter)) {

         JSONObject jsonfilter = JSONObject.fromObject(filter);

         Boolean coupon = jsonfilter.optBoolean("coupon");

         if (coupon != null && coupon) {

            pddfilter.setHasCoupon(true); // 有券

         }

			


         Boolean brand = jsonfilter.optBoolean("brand");

         if (brand != null && brand) {

            pddfilter.setIsBrand(true); // 是否是品牌

@@ -698,15 +838,14 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

		


            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,

                     shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

               array.add(gson.toJson(goodsDetailVO));

            }

         }

      }

		


      data.put("result", array);

      data.put("count", count);

      out.print(JsonUtil.loadTrueResult(data));