From f28cb1b4e59305480ef1effee38b1dc411f775a4 Mon Sep 17 00:00:00 2001
From: 喻健 <Administrator@Admin>
Date: 星期二, 25 十二月 2018 17:50:25 +0800
Subject: [PATCH] 奖金统计

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 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 3a8c84e..2b04903 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
@@ -49,22 +49,6 @@
 	 */
 	Map<String, BigDecimal> countOrderByHongBaoType(@Param("uid") Long uid, @Param("day") Integer day);
 	
-	
-	/**
-	 * 鎬昏鍗�
-	 * @param uid
-	 * @return
-	 */
-	long countOrder(@Param("uid")Long uid, @Param("isToday")Integer isToday);
-	
-	/**
-	 * 鎬昏鍗�
-	 * @param uid
-	 * @return
-	 */
-	BigDecimal countOrderMoney(@Param("uid")Long uid, @Param("isToday")Integer isToday);
-	
-	
 	/**
 	 * 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
 	 * @param uid
@@ -72,4 +56,35 @@
 	 */
 	Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
 			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
+	/**
+	 * 濂栭噾璁㈠崟鏁伴噺
+	 * @param uid
+	 * @return
+	 */
+	long countBonusOrder(@Param("uid")Long uid, @Param("type") Integer type,	@Param("day")Integer day);
+	
+	/**
+	 * 濂栭噾缁熻
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal countBonusOrderMoney(@Param("uid")Long uid, @Param("type") Integer type, @Param("day")Integer day);
+	
+	/**
+	 * 濂栭噾璁㈠崟鍒楄〃
+	 * @param uid
+	 * @return
+	 */
+	List<CommonOrderVO> listBonusOrder(@Param("start") long start, @Param("count") int count, 
+			@Param("uid")Long uid, @Param("type") Integer type, @Param("day")Integer day);
+	
+	/**
+	 * 缁熻璁㈠崟 鏍规嵁璁㈠崟鐘舵��
+	 * @param uid
+	 * @return
+	 */
+	Map<String, BigDecimal> countBonusOrderByState(@Param("uid") Long uid, @Param("type") Integer type,
+			@Param("day")Integer day);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0