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/service/inter/order/CommonOrderService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 0c93087..519c567 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -61,7 +61,7 @@
 	 * @param type 鍒拌处鐘舵��
 	 * @return
 	 */
-	public List<CommonOrderVO> getOrderByUid(Long page, Long uid, Integer state, Integer type,
+	public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type,
 			String orderNo, String startTime, String endTime) throws CommonOrderException;
 
 	/**
@@ -77,14 +77,14 @@
 	 * @param uid
 	 * @return
 	 */
-	public long countOrder(Long uid, Integer isToday);
+	public long countOrder(Long uid, Integer type, Integer isToday);
 	
 	/**
 	 * 缁熻璁㈠崟
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal countOrderMoney(Long uid, Integer isToday);
+	public BigDecimal countOrderMoney(Long uid, Integer type,  Integer isToday);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻
@@ -96,4 +96,17 @@
 	 */
 	public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime);
 
+	/**
+	 * 濂栭噾鍒楄〃缁熻
+	 * @param page
+	 * @param uid
+	 * @param type
+	 * @param day
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	public List<CommonOrderVO> listBonusOrder(Integer page, Long uid, Integer type, Integer day) throws CommonOrderException;
+
+	public Map<String, BigDecimal> countBonusOrderByState(Long uid, Integer type, Integer day);
+
 }

--
Gitblit v1.8.0