From 4fe5f879c1b2919099a6e193ab4db8d25725ca40 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 10:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 49f96ec..df6ab21 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
@@ -313,4 +313,17 @@
 	List<QualityFactory> listByMinSalesCountOrderByCreateTimeDesc(@Param("salesCount") int salesCount,
 			@Param("start") long start, @Param("count") int count);
 
+	/**
+	 * 鎸夋渶浣庨攢閲忓�掑彊鎺掑垪
+	 * 
+	 * @param salesCount
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count, 
+			@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+	
+	long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+
 }

--
Gitblit v1.8.0