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/inter/taobao/ShareHotGoodsService.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java
index 26b0091..99623b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java
@@ -4,6 +4,7 @@
 
 import com.yeshi.fanli.entity.taobao.ShareHotGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 
 public interface ShareHotGoodsService {
 
@@ -21,9 +22,8 @@
 	 * @return
 	 */
 	public List<ShareHotGoods> listByDay(String day);
-	
-	
-	public List<ShareHotGoods> listByDay(String day,int count);
+
+	public List<ShareHotGoods> listByDay(String day, int count);
 
 	/**
 	 * 鏍规嵁涓婚敭鍒犻櫎
@@ -37,7 +37,7 @@
 	 * 
 	 * @return
 	 */
-	public List<TaoBaoGoodsBrief> listPreGoods();
+	public List<TaoBaoGoodsBrief> listPreGoods(int page);
 
 	/**
 	 * 鏍规嵁鍟嗗搧id鍒犻櫎
@@ -52,6 +52,13 @@
 	 * @param auctionId
 	 * @return
 	 */
-	public boolean verifyCanCreateTLJ(Long auctionId);
+	public boolean verifyCanCreateTLJ(Long auctionId,TaoKeAppInfo info);
+
+	/**
+	 * 鏇存柊鍒嗕韩搴撳晢鍝�
+	 * 
+	 * @param goods
+	 */
+	public void updateShareGoods(TaoBaoGoodsBrief goods);
 
 }

--
Gitblit v1.8.0