From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..dd35b0d 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;
@@ -82,13 +84,13 @@
@RequestMapping(value = "getClass", method = RequestMethod.POST)
public void getClass(AcceptData acceptData, PrintWriter out) {
try {
- List<BrandClass> list = brandClassService.listBrandClassEffectiveCache();
+ List<BrandClass> list = brandClassService.listBrandClassEffectiveCache(acceptData.getSystem());
if (list == null) {
list = new ArrayList<BrandClass>();
}
JSONObject data = new JSONObject();
- data.put("bgPicture", configService.get("brand_background_picture"));
+ data.put("bgPicture", configService.getValue(ConfigKeyEnum.brandBackgroundPicture.getKey(),acceptData.getSystem()));
data.put("count", list.size());
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
@@ -227,7 +229,7 @@
if (page == null || page < 1) {
page = 1;
}
- JSONObject data = brandClassShopService.listEffectiveCache(page, cid);
+ JSONObject data = brandClassShopService.listEffectiveCache(page, cid,acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
e.printStackTrace();
@@ -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,acceptData.getSystem());
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
--
Gitblit v1.8.0