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

yujian

2019-12-19 bb07147aaa96d1ef4c99e358dbbe7dad160dc62a

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java

@@ -31,8 +31,8 @@
import com.yeshi.fanli.service.inter.config.CustomerContentService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.StringUtil;

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

@@ -179,7 +179,15 @@
            sf.setStartTkRate(Integer.parseInt(rate));

         } catch (Exception e) {

         }



      if (!StringUtil.isNullOrEmpty(order))

         if (Integer.parseInt(order) == 0)

            sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

         else if (Integer.parseInt(order) == 2)

            sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH);

         else if (Integer.parseInt(order) == 3)

            sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW);

         else if (Integer.parseInt(order) == 4)

            sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);

      if (StringUtil.isNullOrEmpty(kw))

         recommend = true;



@@ -243,12 +251,12 @@
                  }

            } else {

               TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

               if(taoBaoGoodsBriefs!=null)

               for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), "");

                  listExtra.add(taoBaoGoodsBriefExtra);

               }

               if (taoBaoGoodsBriefs != null)

                  for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                     taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                           proportion.toString(), "");

                     listExtra.add(taoBaoGoodsBriefExtra);

                  }

            }

            count = result.getTaoBaoHead().getDocsfound();

         }

@@ -428,7 +436,7 @@
       * out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

       * return; }

       */

      List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 返利券app

      List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4,null); // 板栗快省app

      if (superHotSearchList == null || superHotSearchList.size() == 0) {

         out.print(JsonUtil.loadFalseResult(WebControllerUtil.NODATA));

         return;