From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 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 de14a70..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;
@@ -17,16 +18,19 @@
import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;
import com.yeshi.fanli.dao.mybatis.lable.QualityFactoryMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.bus.lable.LabelGoods;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
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.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;
@@ -39,29 +43,22 @@
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 DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
@Resource
private HongBaoManageService hongBaoManageService;
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+
+ @Resource
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Override
@Cacheable(value = "qualityCache", key = "'listQueryByCouponAmount-'+#start+'-'+#key+'-'+#endAmount+'-'+#startPropor")
@@ -179,15 +176,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 = 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));
@@ -238,7 +237,6 @@
return qualityFactoryMapper.listRecommendToIndex(start, count, proportion, commision, couponAmount, tkRate,
couponRatio);
}
-
@Override
public long countRecommend(Double proportion, Integer commision, Integer couponAmount, double tkRate,
@@ -298,7 +296,7 @@
}
try {
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
} catch (Exception e) {
}
@@ -323,16 +321,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+'-'+#system")
+ public JSONArray getRecommendToIndexV2(long start, int count, String platform, String version, SystemEnum system) {
// 杩斿埄閲戦2鍏冧互涓婏紱
Integer commision = 2;
@@ -343,12 +338,12 @@
// 浼樻儬鐜囬珮浜�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());
}
-
+
List<QualityFactory> listQuery = listRecommend(start, count, pop, commision, couponAmount, tkRate, couponRatio);
if (listQuery == null || listQuery.size() == 0) {
@@ -366,21 +361,20 @@
}
try {
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
} catch (Exception e) {
}
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
+
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+ 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