邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java

@@ -14,6 +14,7 @@
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;

@@ -29,13 +30,11 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.HonestService;

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.DaTaoKeUtil;

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

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


   @Resource

   private HongBaoManageService manageService;



   @Resource

   private HonestService honestService;



   @Resource

   private GoodsClassService goodsClassService;

@@ -238,13 +234,11 @@
      List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();

      List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();



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

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

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

      BigDecimal proportion =manageService.getFanLiRate();



      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

      for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

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

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

         re.add(taoBaoGoodsBriefExtra);

      }



@@ -277,12 +271,11 @@
      List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();



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

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

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

      BigDecimal proportion =manageService.getFanLiRate();



      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

      for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

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

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

         re.add(taoBaoGoodsBriefExtra);

      }



@@ -395,16 +388,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);

         }

      }