From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 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 bb555f2..6e38263 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
@@ -25,11 +25,11 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
-import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -60,14 +60,16 @@
private TaoBaoClassRelationMapper taoBaoClassRelationMapper;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+
+ @Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
@Override
@Cacheable(value = "qualityCache", key = "'listQueryByCouponAmount-'+#start+'-'+#key+'-'+#endAmount+'-'+#startPropor")
@@ -185,17 +187,17 @@
@Cacheable(value = "qualityCache", key = "'listQueryByClassId-'+#start+'-'+#cid")
public List<QualityFactory> listQueryByClassId(long start, int count, Long cid) {
List<QualityFactory> list = qualityFactoryMapper.listQuery(start, count, null, cid, null, null, 1);
-
+
if (list == null) {
list = new ArrayList<QualityFactory>();
}
-
+
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
for (QualityFactory qf : list)
goodsList.add(qf.getTaoBaoGoodsBrief());
- //杩囨护鍟嗗搧淇℃伅
- goodsList=taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);// 杩囨护澶ф窐瀹㈡爣棰�
+ // 杩囨护鍟嗗搧淇℃伅
+ goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);// 杩囨护澶ф窐瀹㈡爣棰�
for (int i = 0; i < list.size(); i++) {
if (i < goodsList.size())
list.get(i).setTaoBaoGoodsBrief(goodsList.get(i));
@@ -246,7 +248,6 @@
return qualityFactoryMapper.listRecommendToIndex(start, count, proportion, commision, couponAmount, tkRate,
couponRatio);
}
-
@Override
public long countRecommend(Double proportion, Integer commision, Integer couponAmount, double tkRate,
@@ -306,7 +307,7 @@
}
try {
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
} catch (Exception e) {
}
@@ -331,16 +332,13 @@
return array;
}
-
-
-
/**
* 棣栭〉鏈�搴曢儴@鍟嗗搧淇℃伅娴�
*/
@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;
@@ -356,7 +354,7 @@
if (fanLiRate != null) {
pop = Double.parseDouble(fanLiRate.toString());
}
-
+
List<QualityFactory> listQuery = listRecommend(start, count, pop, commision, couponAmount, tkRate, couponRatio);
if (listQuery == null || listQuery.size() == 0) {
@@ -374,23 +372,20 @@
}
try {
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
} catch (Exception e) {
}
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,paramsDTO);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
array.add(gson.toJson(detailVO));
}
return array;
}
-
-
@Override
@Cacheable(value = "qualityCache", key = "'countRecommendToIndex-'+#proportion")
public long countRecommendToIndex(String proportion) {
--
Gitblit v1.8.0