From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
index 96fcf67..aa7ef9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsServiceImpl.java
@@ -12,6 +12,7 @@
 
 import com.yeshi.fanli.dao.mybatis.taobao.dataoke.DaTaoKeDetailMapper;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
 import com.yeshi.fanli.util.RedisManager;
@@ -22,7 +23,7 @@
 
 	@Resource
 	private DaTaoKeDetailMapper daTaoKeDetailMapper;
-	
+
 	@Resource
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
@@ -97,6 +98,7 @@
 				|| list.size() == 0)// 瓒呰繃20鍒嗛挓鏈洿鏂�
 		{
 			list = DaTaoKeUtil.getCurrentHotSalesRank();
+			LogHelper.test("鐑攢鏁伴噺:" + list.size());
 			list = reSearchDetails(list);
 			if (list != null && list.size() > 0)
 				redisManager.saveObjList(list, key, null);// 闀挎湡缂撳瓨
@@ -104,10 +106,15 @@
 		} else
 			return list;
 	}
-	
+
 	@Override
-	public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {
-		return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);
+	public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId, int count) {
+		return daTaoKeDetailMapper.getGoodsNotInList(cid, listId, count);
 	}
 
+	@Override
+	public List<DaTaoKeDetail> listBySellerId(long start, int count, Long sellerId){
+		return daTaoKeDetailMapper.listBySellerId(start, count, sellerId);
+	}
+	
 }

--
Gitblit v1.8.0