From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
index b506ef4..f60e3a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
@@ -148,7 +148,6 @@
 	public long countRecommend(Double proportion, Integer startAmount, Integer couponAmount, 
 			double tkRate, Double couponRatio);
 	
-	
 	/**
 	 *  鏍规嵁鍏抽敭璇嶈繘琛屾悳绱㈠晢鍝�-鎼滅储-鎺ㄨ崘
 	 * @param start
@@ -156,9 +155,12 @@
 	 * @param key 鍏抽敭璇�
 	 * @return
 	 */
-	public List<QualityFactory> listRecommendBykey(long start, int count, String key);
+	public List<QualityFactory> listRecommendBykey(long start, int count, String key, Integer hasQuan,
+			Integer userType, Double startprice, Double endprice, Double startTkRate, Double endTkRate, Integer sort);
 	
-	public long countRecommendBykey(String key);
+	public long countRecommendBykey(String key, Integer hasQuan, Integer userType, 
+			Double startprice, Double endprice, Double startTkRate, Double endTkRate);
+	
 	
 	/**
 	 * 棣栭〉鎺ㄨ崘
@@ -167,9 +169,48 @@
 	 * @param proportion  璁＄畻姣斾緥
 	 * @return
 	 */
-	public JSONArray  getRecommendToIndex(long start, int count, String proportion, String fcRate);
+	public JSONArray  getRecommendToIndex(long start, int count, String proportion);
 	
 	public long countRecommendToIndex(String proportion);
 	
+	/**
+	 * 鍗曚釜鍟嗗搧鏍规嵁鏍囩鎺ㄨ崘鍟嗗搧
+	 * @param paramLong
+	 * @param paramString1
+	 * @param paramString2
+	 * @return
+	 */
+	public  List<QualityFactory> recommendByAuctionId(Long paramLong);
 	
+	
+
+	/**
+	 * 鍏嶅崟鍟嗗搧
+	 * @param start
+	 * @param count
+	 * @param tkRate 浣ｉ噾姣斾緥
+	 * @param lableName 鏍囩鍚�
+	 * @return
+	 */
+	public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName);
+
+	public long countFreeGoods(Double tkRate, String lableName);
+	
+	/**
+	 * 闄愭椂绉掓潃闅忔満3涓晢鍝�
+	 * @return
+	 */
+	public List<QualityFactory> listFlashSaleRandGoods();
+	
+	
+	/**
+	 * 鏍规嵁搴楅摵id鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param shopId
+	 * @return
+	 */
+	public List<QualityFactory> listByShopId(long start, int count, Long shopId);
+	
+	public long countByShopId(Long shopId);
 }

--
Gitblit v1.8.0