From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 五月 2020 20:19:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java index 6ce78e5..c04fec4 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java @@ -18,6 +18,8 @@ import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.brand.BrandClass; import com.yeshi.fanli.entity.brand.TaoBaoShopHistory; +import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoShop; import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2; @@ -88,7 +90,7 @@ } JSONObject data = new JSONObject(); - data.put("bgPicture", configService.get("brand_background_picture")); + data.put("bgPicture", configService.get(ConfigKeyEnum.brandBackgroundPicture.getKey())); data.put("count", list.size()); data.put("list", JsonUtil.getApiCommonGson().toJson(list)); @@ -340,7 +342,7 @@ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); - BigDecimal proportion = manageService.getFanLiRate(); + BigDecimal proportion = manageService.getFanLiRate(UserLevelEnum.daRen); for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) { if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) { -- Gitblit v1.8.0