横幅与banner的版本控制初步集成

admin

2019-12-14 e4c86567f24fcc791888321f9d2a0ef6faf5718e

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -255,6 +255,10 @@
         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

            if (StringUtil.isNullOrEmpty(jdId)) {

               jdId = JDUtil.getJDGoodsIdByWeiXin(text);

            }

				
            if (!StringUtil.isNullOrEmpty(jdId)) {

               JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

               if (goods != null) {

@@ -351,7 +355,7 @@
               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         data.put("type", type);

         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

               new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

               new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

         return;

      }

@@ -475,7 +479,7 @@
                  JSONObject data = new JSONObject();

                  data.put("type", 3);

                  data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

                  return true;

               }

@@ -747,7 +751,7 @@
      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

@@ -941,7 +945,7 @@
            BigDecimal shareRate = hongBaoManageService.getShareRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

@@ -1025,7 +1029,7 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);