邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java

@@ -247,19 +247,19 @@
      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) {

         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, "");

            re.add(taoBaoGoodsBriefExtra);

         }

         if (taoBaoGoodsBriefs != null)

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

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

                     "");

               re.add(taoBaoGoodsBriefExtra);

            }

      }

      Gson gson2 = JsonUtil.getApiCommonGson();

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