红包返利比例引用修改

admin

2018-12-10 35ab4226899cba623b38441250920b3773325518

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

@@ -140,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));

@@ -315,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()) {

@@ -326,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 {

@@ -341,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);

               }

            }

@@ -639,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()) {

@@ -649,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 {

@@ -664,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);

               }

            }

@@ -831,10 +826,7 @@
            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) {

@@ -860,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, startTkRate, endTkRate);

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

            startTkRate, endTkRate);



      // 设置发货地址

      TaoBaoSearchNav nav = new TaoBaoSearchNav();

@@ -904,6 +897,7 @@


   /**

    * 设置查询佣金比例范围

    * 
    * @param i

    * @param sf

    */