取消红包参数异常

admin

2018-12-10 5d59c0ad6e82b6255cf38c3dba715395af1d60a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java

@@ -38,6 +38,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;

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

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

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

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

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

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

@@ -58,6 +59,9 @@


   @Resource

   private SystemService systemService;



   @Resource

   private ConfigService configService;



   @Resource

   private SuperHotSearchService superHotSearchSerivce;

@@ -136,11 +140,9 @@
      data.put("nav", gson.toJson(navList));

      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();

      for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {

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

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

      }

      Gson gson2 = JsonUtil.getApiCommonGson();

      data.put("result", gson2.toJson(re));

@@ -311,9 +313,7 @@
      int fq = sf.getQuan();

      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) {

         if (result != null && result.getTaoBaoGoodsBriefs() != null)

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

@@ -322,10 +322,10 @@
                  double sales = count;

                  String salesCountMidea = String.format("%.1f", sales / 10000);

                  bf.setSalesCount(salesCountMidea + "万");

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

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

               } else {

                  bf.setSalesCount(count + "");

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

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

               }

            }

      } else {

@@ -337,13 +337,13 @@
                  double sales = count;

                  String salesCountMidea = String.format("%.1f", sales / 10000);

                  taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                        fcRate, "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), "");

                  re.add(taoBaoGoodsBriefExtra);

               } else {

                  taoBaoGoodsBrief.setSalesCount(count + "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                        fcRate, "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), "");

                  re.add(taoBaoGoodsBriefExtra);

               }

            }

@@ -422,7 +422,7 @@
    */

   @RequestMapping(value = "searchgoods")

   public void searchgoods(AcceptData acceptData, String kw, int page, String filter, String order, String startprice,

         String endprice, String fastFilter, PrintWriter out) {

         String endprice, Double startTkRate, Double endTkRate, String fastFilter, PrintWriter out) {



      String bid = getHistorySearchBid(acceptData);



@@ -603,10 +603,21 @@
            } else if ("materialId".equalsIgnoreCase(ty)) {

               int id = array.optJSONObject(i).optInt("id");

               sf.setProvinceId(id);

            } else if ("tkRate1".equalsIgnoreCase(ty)) {

               setSearchTkRate(0, sf);

            } else if ("tkRate2".equalsIgnoreCase(ty)) {

               setSearchTkRate(1, sf);

            } else if ("tkRate3".equalsIgnoreCase(ty)) {

               setSearchTkRate(2, sf);

            } else if ("tkRate4".equalsIgnoreCase(ty)) {

               setSearchTkRate(3, sf);

            } else if ("tkRate5".equalsIgnoreCase(ty)) {

               setSearchTkRate(4, sf);

            }

         }

         sf.setParams(params);

      }



      TaoBaoSearchResult result = TaoBaoUtil.search(sf);

      if (result == null) {

         return null;

@@ -624,8 +635,7 @@
      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) {

         if (result != null && result.getTaoBaoGoodsBriefs() != null)

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

@@ -634,10 +644,10 @@
                  double sales = count;

                  String salesCountMidea = String.format("%.1f", sales / 10000);

                  bf.setSalesCount(salesCountMidea + "万");

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

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

               } else {

                  bf.setSalesCount(count + "");

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

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

               }

            }

      } else {

@@ -649,13 +659,13 @@
                  double sales = count;

                  String salesCountMidea = String.format("%.1f", sales / 10000);

                  taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                        fcRate, "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), "");

                  re.add(taoBaoGoodsBriefExtra);

               } else {

                  taoBaoGoodsBrief.setSalesCount(count + "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                        fcRate, "");

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), "");

                  re.add(taoBaoGoodsBriefExtra);

               }

            }

@@ -686,6 +696,8 @@
      Double start_Price = null;

      Double end_Price = null;

      Integer sort = null;

      Double startTkRate = null;

      Double endTkRate = null;



      int provinceId = -100;



@@ -724,6 +736,86 @@


            } else if ("fahuodi".equalsIgnoreCase(ty)) {

               provinceId = array.optJSONObject(i).optInt("id");

            } else if ("tkRate1".equalsIgnoreCase(ty)) {

               // 获取对应参数

               String value = configService.get("tkRate_range");

               if (!StringUtil.isNullOrEmpty(value)) {

                  JSONArray tkRatearray = JSONArray.fromObject(value);

                  if (tkRatearray != null) {

                     String start = tkRatearray.optJSONObject(0).optString("start");

                     if (!StringUtil.isNullOrEmpty(start)) {

                        startTkRate = Double.parseDouble(start);

                     }

                     String end = tkRatearray.optJSONObject(0).optString("end");

                     if (!StringUtil.isNullOrEmpty(end)) {

                        endTkRate = Double.parseDouble(end);

                     }

                  }

               }

            } else if ("tkRate2".equalsIgnoreCase(ty)) {

               // 获取对应参数

               String value = configService.get("tkRate_range");

               if (!StringUtil.isNullOrEmpty(value)) {

                  JSONArray tkRatearray = JSONArray.fromObject(value);

                  if (tkRatearray != null) {

                     String start = tkRatearray.optJSONObject(1).optString("start");

                     if (!StringUtil.isNullOrEmpty(start)) {

                        startTkRate = Double.parseDouble(start);

                     }

                     String end = tkRatearray.optJSONObject(1).optString("end");

                     if (!StringUtil.isNullOrEmpty(end)) {

                        endTkRate = Double.parseDouble(end);

                     }

                  }

               }

            } else if ("tkRate3".equalsIgnoreCase(ty)) {

               // 获取对应参数

               String value = configService.get("tkRate_range");

               if (!StringUtil.isNullOrEmpty(value)) {

                  JSONArray tkRatearray = JSONArray.fromObject(value);

                  if (tkRatearray != null) {

                     String start = tkRatearray.optJSONObject(2).optString("start");

                     if (!StringUtil.isNullOrEmpty(start)) {

                        startTkRate = Double.parseDouble(start);

                     }

                     String end = tkRatearray.optJSONObject(2).optString("end");

                     if (!StringUtil.isNullOrEmpty(end)) {

                        endTkRate = Double.parseDouble(end);

                     }

                  }

               }

            } else if ("tkRate4".equalsIgnoreCase(ty)) {

               // 获取对应参数

               String value = configService.get("tkRate_range");

               if (!StringUtil.isNullOrEmpty(value)) {

                  JSONArray tkRatearray = JSONArray.fromObject(value);

                  if (tkRatearray != null) {

                     String start = tkRatearray.optJSONObject(3).optString("start");

                     if (!StringUtil.isNullOrEmpty(start)) {

                        startTkRate = Double.parseDouble(start);

                     }

                     String end = tkRatearray.optJSONObject(3).optString("end");

                     if (!StringUtil.isNullOrEmpty(end)) {

                        endTkRate = Double.parseDouble(end);

                     }

                  }

               }

            } else if ("tkRate5".equalsIgnoreCase(ty)) {

               // 获取对应参数

               String value = configService.get("tkRate_range");

               if (!StringUtil.isNullOrEmpty(value)) {

                  JSONArray tkRatearray = JSONArray.fromObject(value);

                  if (tkRatearray != null) {

                     String start = tkRatearray.optJSONObject(4).optString("start");

                     if (!StringUtil.isNullOrEmpty(start)) {

                        startTkRate = Double.parseDouble(start);

                     }

                     String end = tkRatearray.optJSONObject(4).optString("end");

                     if (!StringUtil.isNullOrEmpty(end)) {

                        endTkRate = Double.parseDouble(end);

                     }

                  }

               }

            }

         }

      }

@@ -731,13 +823,10 @@
      int pageSize = Constant.PAGE_SIZE;



      List<QualityFactory> listQuery = qualityGoodsService.listRecommendBykey(page * pageSize, pageSize, key, hasQuan,

            userType, start_Price, end_Price, sort);

            userType, start_Price, end_Price, startTkRate, endTkRate, sort);



      List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();

      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 (listQuery != null && listQuery.size() > 0) {

         for (QualityFactory selectionGoods : listQuery) {

@@ -763,11 +852,12 @@
               taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));

            listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

         }

      }



      long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price);

      long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price,

            startTkRate, endTkRate);



      // 设置发货地址

      TaoBaoSearchNav nav = new TaoBaoSearchNav();

@@ -805,4 +895,36 @@
      return data;

   }



   /**

    * 设置查询佣金比例范围

    * 
    * @param i

    * @param sf

    */

   public void setSearchTkRate(int i, SearchFilter sf) {

      // 获取对应参数

      String value = configService.get("tkRate_range");



      if (!StringUtil.isNullOrEmpty(value)) {



         JSONArray tkRatearray = JSONArray.fromObject(value);



         if (tkRatearray != null) {



            String start = tkRatearray.optJSONObject(i).optString("start");



            if (!StringUtil.isNullOrEmpty(start)) {

               int tkRate = (int) (Float.parseFloat(start) * 100);

               sf.setStartTkRate(tkRate);

            }



            String end = tkRatearray.optJSONObject(i).optString("end");

            if (!StringUtil.isNullOrEmpty(end)) {

               int tkRate = (int) (Float.parseFloat(end) * 100);

               sf.setEndTkRate(tkRate);

            }

         }



      }

   }

}