From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index dff37a4..b3f7f36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -16,6 +16,7 @@
 import org.yeshi.utils.JsonUtil;
 
 import com.yeshi.fanli.dao.mybatis.brand.BrandClassShopMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.entity.brand.BrandClass;
 import com.yeshi.fanli.entity.brand.BrandClassShop;
 import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -29,8 +30,8 @@
 import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 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.TaoBaoShopService;
 import com.yeshi.fanli.util.Constant;
@@ -432,6 +433,7 @@
 
 		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 		BigDecimal shareRate = hongBaoManageService.getShareRate();
+		ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
 
 		// 娣樺疂鍟嗗搧淇℃伅杩囨护
 		Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
@@ -467,7 +469,7 @@
 			taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
 			for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
 				GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
-						.convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);
+						.convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()),paramsDTO);
 				listGoods.add(goodsDetailVO);
 			}
 			taoBaoShopVO.setListGoodsVO(listGoods);
@@ -524,4 +526,99 @@
 
 	}
 
+	
+	@Override
+	public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid) {
+		if (cid != null && cid <= 0) {
+			cid = null;
+		}
+		
+		List<TaoBaoShopVO> listInfo = taoBaoShopService.listBrandShopinfo(start, count, cid);
+		if (listInfo == null || listInfo.size() == 0)
+			return listInfo;
+		
+
+		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+		BigDecimal shareRate = hongBaoManageService.getShareRate();
+		ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+		// 娣樺疂鍟嗗搧淇℃伅杩囨护
+		Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
+
+		for (TaoBaoShopVO taoBaoShopVO : listInfo) {
+			String shopNameCustom = taoBaoShopVO.getShopNameCustom();
+			if (!StringUtil.isNullOrEmpty(shopNameCustom)) {
+				taoBaoShopVO.setShopName(shopNameCustom);
+			}
+
+			String shopIconCustom = taoBaoShopVO.getShopIconCustom();
+			if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
+				taoBaoShopVO.setShopIcon(shopIconCustom);
+			}
+
+			List<GoodsDetailVO> listGoods = new ArrayList<GoodsDetailVO>();
+			List<TaoBaoGoodsBrief> listGoodsBrief = taoBaoShopVO.getListGoodsBrief();
+			// 鍟嗗搧娣诲姞鍒版洿鏂伴槦鍒�
+			taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
+			for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
+				GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
+						.convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), paramsDTO);
+				listGoods.add(goodsDetailVO);
+			}
+			taoBaoShopVO.setListGoodsVO(listGoods);
+		}
+		return listInfo;
+	}
+
+	
+	@Override
+	public long countBrandShopinfo(Long cid) {
+		if (cid != null && cid <= 0) {
+			cid = null;
+		}
+		return taoBaoShopService.countBrandShopinfo(cid);
+	}
+	
+	
+	
+	@Override
+	public List<TaoBaoShop> listEffectiveClassShop(Long cid) {
+		if (cid == null)
+			return null;
+		
+		List<BrandClassShop> list = brandClassShopMapper.listEffective(cid);
+		if (list == null || list.size() == 0)
+			return null;
+
+	    List<TaoBaoShop> listShop = new ArrayList<TaoBaoShop>();
+		for (BrandClassShop brandClassShop : list) {
+			TaoBaoShop shop = brandClassShop.getShop();
+			if (shop != null) {
+				Integer userType = shop.getUserType();
+				if (userType == null || userType == 0) {
+					shop.setUserType(10);
+				} else {
+					shop.setUserType(11);
+				}
+
+				String shopLink = shop.getShopLink();
+				if (StringUtil.isNullOrEmpty(shopLink)) {
+					shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
+				}
+
+				String shopNameCustom = shop.getShopNameCustom();
+				if (!StringUtil.isNullOrEmpty(shopNameCustom)) {
+					shop.setShopName(shopNameCustom);
+				}
+
+				String shopIconCustom = shop.getShopIconCustom();
+				if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
+					shop.setShopIcon(shopIconCustom);
+				}
+
+				listShop.add(shop);
+			}
+		}
+		return listShop;
+	}
+	
 }

--
Gitblit v1.8.0