From dee14e78ad573d7488975a990476e16990bb6376 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:14:51 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 2226198..b276c2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -25,7 +25,7 @@
 	List<CommonOrderVO> listUserOrder(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
 			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
 			@Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
-			@Param("day") Integer day, @Param("source")Integer source);
+			@Param("day") Integer day, @Param("source") Integer source);
 
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -37,7 +37,8 @@
 	 */
 	long countUserOrder(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
 			@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
-			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day, @Param("source")Integer source);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+			@Param("source") Integer source);
 
 	/**
 	 * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
@@ -75,7 +76,8 @@
 	 * @param uid
 	 * @return
 	 */
-	Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day, @Param("source") Integer source);
+	Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day,
+			@Param("source") Integer source);
 
 	/**
 	 * 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -84,8 +86,8 @@
 	 * @return
 	 */
 	Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
-			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day, 
-			@Param("source")Integer source);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+			@Param("source") Integer source);
 
 	/**
 	 * 濂栭噾璁㈠崟鏁伴噺
@@ -94,7 +96,7 @@
 	 * @return
 	 */
 	long countBonusOrderNumber(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
-			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
 
 	/**
 	 * 濂栭噾缁熻
@@ -103,7 +105,7 @@
 	 * @return
 	 */
 	BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
-			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
 
 	/**
 	 * 濂栭噾缁熻
@@ -112,7 +114,8 @@
 	 * @return
 	 */
 	Map<String, Object> countBonusOrderMoneyAndNumber(@Param("uid") Long uid, @Param("type") Integer type,
-			@Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("source") Integer source);
 
 	int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
 
@@ -171,14 +174,38 @@
 	List<CommonOrderVO> listQuery(@Param("start") long start, @Param("count") int count,
 			@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source")Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source);
+
+	/**
+	 * 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
+	 * 
+	 * @param start
+	 * @param count
+	 * @param keyType
+	 * @param key
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param startTime
+	 * @param endTime
+	 * @param source
+	 * @return
+	 */
+	List<CommonOrderVO> listQueryWithNoChild(@Param("start") long start, @Param("count") int count,
+			@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
+			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
+			@Param("endTime") String endTime, @Param("source") Integer source);
 
 	/**
 	 * 缁熻
 	 */
 	long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
 			@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
-			@Param("endTime") String endTime, @Param("source")Integer source);
+			@Param("endTime") String endTime, @Param("source") Integer source);
+
+	long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
+			@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
 
 	/**
 	 * 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃

--
Gitblit v1.8.0