From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 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 27ad1db..9631a8e 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
@@ -75,7 +75,6 @@
 	 * @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);
 
 	/**
@@ -96,7 +95,20 @@
 	BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
 			@Param("startTime") String startTime, @Param("endTime") String endTime);
 	
-
+	
+	/**
+	 * 濂栭噾缁熻
+	 * 
+	 * @param uid
+	 * @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);
+	
+	
+	
+	
+	
 	
 	int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
 
@@ -114,5 +126,33 @@
 	 */
 	CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
 			@Param("orderType") int orderType, @Param("orderBy") int orderBy);
+	
+	
+	/**
+	 * 璁㈠崟鍒楄〃鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<CommonOrderVO> listQueryByUid(@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);
+
+	/**
+	 * 缁熻
+	 */
+	long countQueryByUid(@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);
+
 
 }
\ No newline at end of file

--
Gitblit v1.8.0