店铺足迹

yujian

2019-04-28 ff6961414b1c3d369f07adeb92ecf8ea33eebe15

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

@@ -10,12 +10,10 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



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 com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -28,13 +26,16 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

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

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

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.user.HistorySearchService;

import com.yeshi.fanli.util.StringUtil;

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/web/v1/webSearch")

@@ -54,6 +55,9 @@


   @Resource

   private SuperHotSearchService superHotSearchSerivce;

	
   @Resource

   private CustomerContentService customerContentService;



   // 优惠券

   /*

@@ -248,16 +252,15 @@
      int fh = sf.getHongbao();

      boolean ft = sf.isTmall();

      Map<String, String> map = manageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = manageService.getFanLiRate();

      if (fq == 0 && fh == 0 && !ft) {

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

            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

         }

      } else {

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            re.add(taoBaoGoodsBriefExtra);

         }

      }

@@ -276,7 +279,7 @@
   @RequestMapping(value = "contactCustomer", method = RequestMethod.GET)

   public void contactCustomerService(PrintWriter out) {

      String title = "联系客服";

      List<CustomerContent> contentList = systemClientParamsService.contactCustomerService(title);

      List<CustomerContent> contentList = customerContentService.contactCustomerService(title);

      JSONObject data = new JSONObject();

      data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));

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