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/service/impl/taobao/TaoBaoShopServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
index 60125f6..63d6c80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -173,13 +174,13 @@
@Override
@Cacheable(value = "brandCache", key = "'getShopByKey-'+#key")
- public List<TaoBaoShopVO> getShopByKey(String key) {
+ public List<TaoBaoShopVO> getShopByKey(String key, SystemEnum system) {
List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
if (list == null || list.size() == 0) {
return null;
}
- BigDecimal proportion = hongBaoManageService.getFanLiRate(UserLevelEnum.daRen);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(UserLevelEnum.daRen,system);
for (TaoBaoShopVO taoBaoShopVO : list) {
String shopLink = taoBaoShopVO.getShopLink();
@@ -208,14 +209,14 @@
}
@Override
- @Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key+'-'+#platform+'-'+#version")
- public List<TaoBaoShopVO> getShopByKeyV2(String key, String platform, String version) {
+ @Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key+'-'+#platform+'-'+#version+'-'+#system")
+ public List<TaoBaoShopVO> getShopByKeyV2(String key, String platform, String version,SystemEnum system) {
List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
if (list == null || list.size() == 0) {
return null;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,UserLevelEnum.daRen);
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,UserLevelEnum.daRen,system);
for (TaoBaoShopVO taoBaoShopVO : list) {
--
Gitblit v1.8.0