From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index 11437e2..0ba38d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -5,6 +5,7 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -58,10 +59,6 @@
@Controller
@RequestMapping("api/v2/brand")
public class BrandControllerV2 {
-
- @Resource
- private BrandClassService brandClassService;
-
@Resource
private BrandClassShopService brandClassShopService;
@@ -110,7 +107,7 @@
if (page == null || page < 1) {
page = 1;
}
- JSONObject data = brandClassShopService.listEffectiveCacheV2(page, cid,acceptData.getPlatform(),acceptData.getVersion());
+ JSONObject data = brandClassShopService.listEffectiveCacheV2(page, cid,acceptData.getPlatform(),acceptData.getVersion(),acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(data));
}
@@ -308,7 +305,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
// 鍟嗗搧淇℃伅杩囨护
listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -373,7 +370,7 @@
JSONObject data = new JSONObject();
if (page == 1 && cid != null) {
- List<BrandInfo> brandlist = brandInfoService.listValidBrandInfoCache(cid);
+ List<BrandInfo> brandlist = brandInfoService.listValidBrandInfoCache(cid,acceptData.getSystem());
if(brandlist == null)
brandlist = new ArrayList<BrandInfo>();
data.put("brandlist", JsonUtil.getApiCommonGson().toJson(brandlist));
@@ -382,7 +379,7 @@
long count = brandInfoService.countBrandInfo(cid);
- List<BrandInfoVO> list = brandInfoService.listBrandInfoCache((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion());
+ List<BrandInfoVO> list = brandInfoService.listBrandInfoCache((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion(),acceptData.getSystem());
if (list == null)
list = new ArrayList<BrandInfoVO>();
@@ -532,7 +529,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
// 鍟嗗搧淇℃伅杩囨护
listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -676,15 +673,15 @@
}
if (page == 1 && cid != null) {
- List<BrandInfo> brandlist = brandInfoService.listValidByCidToApp(cid);
+ List<BrandInfo> brandlist = brandInfoService.listValidByCidToApp(cid,acceptData.getSystem());
if(brandlist == null)
brandlist = new ArrayList<BrandInfo>();
data.put("brandlist", JsonUtil.getApiCommonGson().toJson(brandlist));
}
- long count = brandInfoService.countValidByCidToApp(cid);
+ long count = brandInfoService.countValidByCidToApp(cid,acceptData.getSystem());
- List<BrandInfoVO> list = brandInfoService.listValidToApp((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion());
+ List<BrandInfoVO> list = brandInfoService.listValidToApp((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion(), acceptData.getSystem());
if (list == null)
list = new ArrayList<BrandInfoVO>();
@@ -722,7 +719,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
JSONArray array = new JSONArray();
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id);
--
Gitblit v1.8.0