From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |   81 +++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 46 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 e87a922..eb58fe9 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
@@ -6,6 +6,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
+import com.yeshi.fanli.vo.quality.QualityFactoryVO;
 
 public interface QualityFactoryMapper {
 
@@ -76,53 +77,9 @@
 	long countQueryNeedUpdate();
 
 	// 绮鹃�夊簱鏌ヨ
-	List<QualityFactory> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
-			// 鎺掑簭瀛楁 锛氶攢閲忋�佷环鏍笺�佷剑閲�
-			@Param("totalSales") Integer totalSales, @Param("price") Integer price, @Param("tkRate") Integer tkRate,
-			// 鍟嗗搧鏉ユ簮銆佸叆搴撴椂闂�
-			@Param("propor") Integer propor, @Param("goodsSource") Integer goodsSource, @Param("days") Integer days,
-			// 鍦ㄥ敭浠疯寖鍥�
-			@Param("startZkPrice") Integer startZkPrice, @Param("endZkPrice") Integer endZkPrice,
-			// 鏈堥攢閲忚寖鍥�
-			@Param("startBiz30day") Integer startBiz30day, @Param("endBiz30day") Integer endBiz30day,
-			// 鏉冮噸鑼冨洿
-			@Param("startWeight") Integer startWeight, @Param("endWeight") Integer endWeight,
-			// 浣ｉ噾姣斾緥鑼冨洿
-			@Param("startTkRate") Integer startTkRate, @Param("endTkRate") Integer endTkRate,
-			// 鍒搁潰棰濓細鍑忓灏�
-			@Param("startAmount") Integer startAmount, @Param("endAmount") Integer endAmount,
-			// 鏄惁锛� 浼樻儬鍒� 銆佸寘閭�
-			@Param("hasCoupon") Integer hasCoupon, @Param("freeShipment") Integer freeShipment,
-			// 鏄惁锛氭秷璐硅�呬繚闅� 銆佹垚浜よ浆鍖�
-			@Param("isPrepay") Integer isPrepay, @Param("payRate30") Integer payRate30,
-			// 鏄惁锛氬ソ璇勭巼銆� 閫�娆剧巼
-			@Param("goodRate") Integer goodRate, @Param("rfdRate") Integer rfdRate,
-			// 鍒告瘮渚嬶細 鍒搁潰鍊�/鍦ㄥ敭浠�
-			@Param("startPropor") Integer startPropor, @Param("endPropor") Integer endPropor,
-			// 绫荤洰id 鎼滅储姝ょ被鍨�
-			@Param("gcid") Long gcid, @Param("keyType") Integer keyType);
+	List<QualityFactory> query(QualityFactoryVO qualityFactoryVO);
 
-	long queryCount(@Param("key") String key, @Param("goodsSource") Integer goodsSource, @Param("days") Integer days,
-			// 鍦ㄥ敭浠疯寖鍥�
-			@Param("startZkPrice") Integer startZkPrice, @Param("endZkPrice") Integer endZkPrice,
-			// 鏈堥攢閲忚寖鍥�
-			@Param("startBiz30day") Integer startBiz30day, @Param("endBiz30day") Integer endBiz30day,
-			// 鏉冮噸鑼冨洿
-			@Param("startWeight") Integer startWeight, @Param("endWeight") Integer endWeight,
-			// 浣ｉ噾姣斾緥鑼冨洿
-			@Param("startTkRate") Integer startTkRate, @Param("endTkRate") Integer endTkRate,
-			// 鍒搁潰棰濓細鍑忓灏�
-			@Param("startAmount") Integer startAmount, @Param("endAmount") Integer endAmount,
-			// 鏄惁锛� 浼樻儬鍒� 銆佸寘閭�
-			@Param("hasCoupon") Integer hasCoupon, @Param("freeShipment") Integer freeShipment,
-			// 鏄惁锛氭秷璐硅�呬繚闅� 銆佹垚浜よ浆鍖�
-			@Param("isPrepay") Integer isPrepay, @Param("payRate30") Integer payRate30,
-			// 鏄惁锛氬ソ璇勭巼銆� 閫�娆剧巼
-			@Param("goodRate") Integer goodRate, @Param("rfdRate") Integer rfdRate,
-			// 鍒告瘮渚嬶細 鍒搁潰鍊�/鍦ㄥ敭浠�
-			@Param("startPropor") Integer startPropor, @Param("endPropor") Integer endPropor,
-			// 绫荤洰id
-			@Param("gcid") Long gcid, @Param("keyType") Integer keyType);
+	long queryCount(QualityFactoryVO qualityFactoryVO);
 
 	/**
 	 * 缁熻鍟嗗搧鏁伴噺
@@ -261,6 +218,12 @@
 	long countQueryByFlashSale();
 
 	/**
+	 * 闄愭椂绉掓潃 闅忔満3涓晢鍝�
+	 * @return
+	 */
+	List<QualityFactory> listFlashSaleRandGoods();
+	
+	/**
 	 * 杩斿埄閲戦鏁版嵁鏌ヨ
 	 * 
 	 * @param start
@@ -356,4 +319,30 @@
 	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);
+
+	
+	/**
+	 * 鏍规嵁搴楅摵淇℃伅鑾峰彇鍟嗗搧
+	 * @param start
+	 * @param count
+	 * @param shopId
+	 * @return
+	 */
+	List<QualityFactory> listByShopId(@Param("start") long start, @Param("count") int count, 
+			@Param("shopId") Long shopId);
+	
+	long countByShopId(@Param("shopId") Long shopId);
+
 }

--
Gitblit v1.8.0