admin
2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -92,7 +92,7 @@
      }
      CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
            cid, page, 10);
            cid, page, 10,acceptData.getSystem());
      // 保留暂时不开启,待后续开启
      List<SwiperPicture> bannerList = new ArrayList<>();
@@ -103,7 +103,7 @@
      JSONArray array = new JSONArray();
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
      BigDecimal pro = hongBaoManageService.getFanLiRate();
      BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem());
      if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 免单商品
         pro = new BigDecimal(100);
      List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();