From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 d67fe4d..26b0091 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
@@ -3,6 +3,7 @@
import java.util.List;
import com.yeshi.fanli.entity.taobao.ShareHotGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
public interface ShareHotGoodsService {
@@ -22,16 +23,35 @@
public List<ShareHotGoods> listByDay(String day);
+ public List<ShareHotGoods> listByDay(String day,int count);
+
/**
* 鏍规嵁涓婚敭鍒犻櫎
+ *
* @param id
*/
public void deleteById(String id);
/**
+ * 鑾峰彇澶囬�夊晢鍝�
+ *
+ * @return
+ */
+ public List<TaoBaoGoodsBrief> listPreGoods();
+
+ /**
* 鏍规嵁鍟嗗搧id鍒犻櫎
+ *
* @param goodsId
*/
public void deleteByGoodsId(Long goodsId);
+ /**
+ * 楠岃瘉鏄惁鍙互鍒涘缓娣樼ぜ閲�
+ *
+ * @param auctionId
+ * @return
+ */
+ public boolean verifyCanCreateTLJ(Long auctionId);
+
}
--
Gitblit v1.8.0