From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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..bb555f2 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
@@ -17,16 +17,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.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.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -61,6 +64,9 @@
 	
 	@Resource
 	private HongBaoManageService hongBaoManageService;
+	
+	@Resource
+	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
 	
 
 	@Override
@@ -187,6 +193,8 @@
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		for (QualityFactory qf : list)
 			goodsList.add(qf.getTaoBaoGoodsBrief());
+		//杩囨护鍟嗗搧淇℃伅
+		goodsList=taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
 		goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);// 杩囨护澶ф窐瀹㈡爣棰�
 		for (int i = 0; i < list.size(); i++) {
 			if (i < goodsList.size())
@@ -371,8 +379,10 @@
 		}
 
 		BigDecimal shareRate = hongBaoManageService.getShareRate();
+	    ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+
 		for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
-			GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+			GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,paramsDTO);
 			array.add(gson.toJson(detailVO));
 		}
 

--
Gitblit v1.8.0