From 0efda3a0ac631642dfe879487d7b93415363bbd4 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 11:41:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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..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
@@ -218,6 +218,12 @@
long countQueryByFlashSale();
/**
+ * 闄愭椂绉掓潃 闅忔満3涓晢鍝�
+ * @return
+ */
+ List<QualityFactory> listFlashSaleRandGoods();
+
+ /**
* 杩斿埄閲戦鏁版嵁鏌ヨ
*
* @param start
@@ -313,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