From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 8c7d5f5..9c456e2 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
@@ -22,7 +22,6 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.db.MongoDBManager;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -201,22 +200,19 @@
}
return list;
}
-
-
+
@Override
- @Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key")
- public List<TaoBaoShopVO> getShopByKeyV2(String key) {
+ @Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key+'-'+#platform+'-'+#version")
+ public List<TaoBaoShopVO> getShopByKeyV2(String key, String platform, String version) {
List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
if (list == null || list.size() == 0) {
return null;
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(platform, version);
for (TaoBaoShopVO taoBaoShopVO : list) {
-
+
Integer userType = taoBaoShopVO.getUserType();
if (userType == null || userType == 0) {
taoBaoShopVO.setUserType(10);
--
Gitblit v1.8.0