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/service/impl/brand/BrandInfoServiceImpl.java |   50 ++++++++++++++++++--------------------------------
 1 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index 63e3deb..7977663 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -9,6 +9,7 @@
 import javax.annotation.Resource;
 
 import com.yeshi.fanli.entity.SystemEnum;
+import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
@@ -52,25 +53,10 @@
 	private BrandInfoMapper brandInfoMapper;
 
 	@Resource
-	private HongBaoManageService hongBaoManageService;
-	
-	@Resource
 	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource
-	private QualityGoodsService qualityGoodsService;
-
-	@Resource
-	private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
-	@Resource
-	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
-	@Resource
 	private BrandClassShopService brandClassShopService;
-
-	@Resource
-	private BrandShopCaheDao brandShopCaheDao;
 
 	@Resource
 	private BrandGoodsCaheService brandGoodsCaheService;
@@ -300,10 +286,10 @@
 
 	@Override
 	@Cacheable(value = "brandCache", key = "'listValidBrandInfoCache-'+#cid")
-	public List<BrandInfo> listValidBrandInfoCache(Long cid) {
+	public List<BrandInfo> listValidBrandInfoCache(Long cid,SystemEnum system) {
 		List<BrandInfo> listInfo = new ArrayList<BrandInfo>();
 
-		List<TaoBaoShop> listShop = brandClassShopService.listEffectiveClassShop(cid);
+		List<TaoBaoShop> listShop = brandClassShopService.listEffectiveClassShop(cid,system);
 		if (listShop == null || listShop.size() == 0)
 			return listInfo;
 		for (TaoBaoShop taoBaoShop : listShop) {
@@ -317,11 +303,11 @@
 	}
 
 	@Override
-	@Cacheable(value = "brandCache", key = "'listBrandInfoCache-'+#start+'-'+#start +'-'+#cid+'-'+#platform+'-'+#version")
-	public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid, String platform, String version) {
+	@Cacheable(value = "brandCache", key = "'listBrandInfoCache-'+#start+'-'+#start +'-'+#cid+'-'+#platform+'-'+#version+'-'+#system")
+	public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid, String platform, String version,SystemEnum system) {
 		List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();
 
-		List<TaoBaoShopVO> listShop = brandClassShopService.listEffectiveShop(start, count, cid, platform, version);
+		List<TaoBaoShopVO> listShop = brandClassShopService.listEffectiveShop(start, count, cid, platform, version,system);
 		if (listShop == null || listShop.size() == 0)
 			return listInfo;
 
@@ -436,26 +422,26 @@
 	}
 
 	@Override
-	public long countValidByCidToApp(Long cid) {
-		return brandInfoMapper.countValidByCidToApp(cid);
+	public long countValidByCidToApp(Long cid, SystemEnum system) {
+		return brandInfoMapper.countValidByCidToApp(cid,system);
 	}
 
 	@Override
-	@Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid")
-	public List<BrandInfo> listValidByCidToApp(Long cid) {
+	@Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid+'-'+#system")
+	public List<BrandInfo> listValidByCidToApp(Long cid, SystemEnum system) {
 		if (cid == null)
 			return null;
-		return brandInfoMapper.listValidByCidToApp(cid);
+		return brandInfoMapper.listValidByCidToApp(cid,system);
 	}
 
-	@Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#cid")
+	@Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#cid+'-'+#system")
 	@Override
-	public List<BrandInfoVO> listValidToApp(long start, int count, Long cid, String platform, String version) {
-		List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid);
+	public List<BrandInfoVO> listValidToApp(long start, int count, Long cid, String platform, String version,SystemEnum system) {
+		List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid,system);
 		if (list == null || list.size() == 0)
 			return null;
 
-		ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
+		ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
 
 		List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();
 		for (int i = 0; i < list.size(); i++) {
@@ -497,8 +483,8 @@
 	}
 
 	@Override
-	@Cacheable(value = "brandCache", key = "'listByAlikeName-'+#key+'-'+#platform+'-'+#version")
-	public BrandInfoVO listByAlikeName(String key, String platform, String version) {
+	@Cacheable(value = "brandCache", key = "'listByAlikeName-'+#key+'-'+#platform+'-'+#version+'-'+#system")
+	public BrandInfoVO listByAlikeName(String key, String platform, String version,SystemEnum system) {
 		if (StringUtil.isNullOrEmpty(key))
 			return null;
 
@@ -506,7 +492,7 @@
 		if (list == null || list.size() == 0)
 			return null;
 
-		ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
+		ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, system);
 
 		BrandInfoVO brand = list.get(0);
 		List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId(1, 3, brand.getId());

--
Gitblit v1.8.0