From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug,分享爆款自购修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
index e04ec08..ba24a9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.taobao.dataoke;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -45,6 +46,7 @@
 				addGoodsList(result.getDetailList());
 				totalCount += result.getDetailList().size();
 			} catch (Exception e) {
+				e.printStackTrace();
 			}
 		}
 		LogHelper.test("澶ф窐瀹㈡�诲叡鏇存柊鏁版嵁鏁伴噺:" + totalCount);
@@ -86,8 +88,9 @@
 		List<DaTaoKeDetail> dtList = listByGoodsIds(goodsIdList);
 
 		Map<Long, DaTaoKeDetail> map = new HashMap<>();
-		for (DaTaoKeDetail goods : dtList)
-			map.put(goods.getGoodsId(), goods);
+		if (dtList != null)
+			for (DaTaoKeDetail goods : dtList)
+				map.put(goods.getGoodsId(), goods);
 		for (TaoBaoGoodsBrief goods : goodsList) {
 			DaTaoKeDetail detail = map.get(goods.getAuctionId());
 			goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);
@@ -137,4 +140,15 @@
 		return daTaoKeDetailMapper.getGoodsNotInList(cid, listId, count);
 	}
 
+	@Override
+	public List<DaTaoKeDetail> listByCidAndMaxPrice(Integer cid, BigDecimal maxPrice, int page, int pageSize) {
+		return daTaoKeDetailMapper.listByCidAndMaxMinPrice(cid, maxPrice, null, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public Long countByCidAndMaxPrice(Integer cid, BigDecimal maxPrice) {
+
+		return daTaoKeDetailMapper.countByCidAndMaxMinPrice(cid, maxPrice, null);
+	}
+
 }

--
Gitblit v1.8.0