From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
index 9f7e01e..9cf783c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
@@ -334,7 +334,20 @@
 	 * @param key 鍏抽敭璇�
 	 * @return
 	 */
-	List<QualityFactory> listRecommendBykey(@Param("start") long start, @Param("count") int count, @Param("key") String key);
+	List<QualityFactory> listRecommendBykey(@Param("start") long start, @Param("count") int count, 
+			@Param("key") String key,@Param("hasQuan") Integer hasQuan,  @Param("userType") Integer userType,
+			@Param("startprice") Double startprice, @Param("endprice") Double endprice,
+			@Param("startTkRate") Double startTkRate, @Param("endTkRate") Double endTkRate,
+			@Param("sort") Integer sort);
 	
-	long countRecommendBykey(@Param("key") String key);
+	long countRecommendBykey(@Param("key") String key, @Param("hasQuan") Integer hasQuan,  
+			@Param("userType") Integer userType,@Param("startprice") Double startprice, 
+			@Param("endprice") Double endprice,@Param("startTkRate") Double startTkRate, 
+			@Param("endTkRate") Double endTkRate);
+
+
+	List<QualityFactory> listQueryBylabIDs(@Param("start") long start, @Param("count") int count, 
+			@Param("list") List<Long> list, @Param("gid") Long gid,@Param("systemCid") Long systemCid);
+
+
 }

--
Gitblit v1.8.0