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/lable/QualityGoodsServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
index f10ac2f..7980a39 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
@@ -339,8 +339,8 @@
* 棣栭〉鏈�搴曢儴@鍟嗗搧淇℃伅娴�
*/
@Override
- @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start")
- public JSONArray getRecommendToIndexV2(long start, int count) {
+ @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start+'-'+#platform+'-'+#version")
+ public JSONArray getRecommendToIndexV2(long start, int count,String platform,String version) {
// 杩斿埄閲戦2鍏冧互涓婏紱
Integer commision = 2;
@@ -378,8 +378,7 @@
} catch (Exception e) {
}
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
+ ConfigParamsDTO paramsDTO =hongBaoManageService.getShowComputeRate(platform, version);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,paramsDTO);
--
Gitblit v1.8.0