From 146dbd5ed24c1fe63766aa45e0ce602caa39748e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 八月 2022 17:53:10 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 7ca354d..2d86107 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
@@ -17,7 +17,7 @@
 import org.yeshi.utils.JsonUtil;
 
 import com.yeshi.fanli.dao.mybatis.brand.BrandClassShopMapper;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
 import com.yeshi.fanli.entity.brand.BrandClass;
 import com.yeshi.fanli.entity.brand.BrandClassShop;
 import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -320,7 +320,7 @@
 		}
 
 		// 娣樺疂鍟嗗搧淇℃伅杩囨护
-		Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
+		Map<String, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
 
 		BigDecimal proportion = hongBaoManageService.getFanLiRate(system);
 		for (TaoBaoShopVO taoBaoShopVO : listInfo) {
@@ -360,14 +360,14 @@
 	 * @param listInfo
 	 * @return
 	 */
-	private Map<Long, TaoBaoGoodsBrief> getFilterTaoBaoGoods(List<TaoBaoShopVO> listInfo) {
+	private Map<String, TaoBaoGoodsBrief> getFilterTaoBaoGoods(List<TaoBaoShopVO> listInfo) {
 		// 杩囨护鍟嗗搧
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		for (TaoBaoShopVO taoBaoShopVO : listInfo) {
 			goodsList.addAll(taoBaoShopVO.getListGoodsBrief());
 		}
 		goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
-		Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
+		Map<String, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
 		for (TaoBaoGoodsBrief goods : goodsList)
 			goodsMap.put(goods.getAuctionId(), goods);
 		return goodsMap;
@@ -382,7 +382,7 @@
 			cid = null;
 		}
 
-		List<TaoBaoShop> listShop = new ArrayList<TaoBaoShop>();
+		List<TaoBaoShop> listShop = new ArrayList<>();
 		// 绗竴椤� 鏌ヨ鍏ㄩ儴鍒嗙被涓嬪簵閾�
 		if (page == 1 && cid != null) {
 			List<BrandClassShop> list = brandClassShopMapper.listEffective(cid,system);
@@ -436,10 +436,10 @@
 			count = taoBaoShopService.countBrandShopinfo(cid);
 		}
 
-		ConfigParamsDTO paramsDTO = 	orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
+		GoodsMoneyConfigParamsDTO paramsDTO = 	orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
 
 		// 娣樺疂鍟嗗搧淇℃伅杩囨护
-		Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
+		Map<String, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
 
 		for (TaoBaoShopVO taoBaoShopVO : listInfo) {
 
@@ -541,10 +541,10 @@
 			return listInfo;
 		
 
-		ConfigParamsDTO paramsDTO = 
+		GoodsMoneyConfigParamsDTO paramsDTO =
 				orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
 		// 娣樺疂鍟嗗搧淇℃伅杩囨护
-		Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
+		Map<String, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
 
 		for (TaoBaoShopVO taoBaoShopVO : listInfo) {
 			String shopNameCustom = taoBaoShopVO.getShopNameCustom();

--
Gitblit v1.8.0