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/lable/QualityGoodsServiceImpl.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 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 6e38263..8ef445d 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
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.yeshi.utils.JsonUtil;
@@ -42,22 +43,10 @@
public class QualityGoodsServiceImpl implements QualityGoodsService {
@Resource
- private RedisManager redisManager;
- @Resource
private QualityFactoryMapper qualityFactoryMapper;
- @Resource
- private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
- @Resource
- private LabelGoodsMapper labelGoodsMapper;
- @Resource
- private LabelService labelService;
- @Resource
- private TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper;
- @Resource
- private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private TaoBaoClassRelationMapper taoBaoClassRelationMapper;
+ private LabelGoodsMapper labelGoodsMapper;
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@@ -337,8 +326,8 @@
* 棣栭〉鏈�搴曢儴@鍟嗗搧淇℃伅娴�
*/
@Override
- @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start+'-'+#platform+'-'+#version")
- public JSONArray getRecommendToIndexV2(long start, int count, String platform, String version) {
+ @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start+'-'+#platform+'-'+#version+'-'+#system")
+ public JSONArray getRecommendToIndexV2(long start, int count, String platform, String version, SystemEnum system) {
// 杩斿埄閲戦2鍏冧互涓婏紱
Integer commision = 2;
@@ -349,7 +338,7 @@
// 浼樻儬鐜囬珮浜�10%浠ヤ笂锛堜紭鎯犵巼=浼樻儬鍒搁潰棰�/鍟嗗搧鍦ㄥ敭浠�*100%锛�
Double couponRatio = 10.0;
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(system);
Double pop = 50.0;
if (fanLiRate != null) {
pop = Double.parseDouble(fanLiRate.toString());
@@ -376,7 +365,7 @@
} catch (Exception e) {
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
--
Gitblit v1.8.0