From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 10:19:34 +0800
Subject: [PATCH] 用户资金记录bug修改,京东,拼多多小程序商品转链

---
 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 54f74eb..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);
+		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