From f0f94a69b05dd6049e1b3dff2ef3f7a9ac8332fb Mon Sep 17 00:00:00 2001
From: yujian <Administrator@Admin>
Date: 星期三, 26 十二月 2018 14:14:10 +0800
Subject: [PATCH] 订单接口优化

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 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 2b04903..6554b5f 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
@@ -20,8 +20,9 @@
 	 * @return
 	 */
 	List<CommonOrderVO> listGroupOrderNoByUid(@Param("start") long start, @Param("count") int count, 
-		@Param("uid") Long uid,@Param("state") Integer state, @Param("type") Integer type,
-		@Param("orderNo")String orderNo, @Param("startTime")String startTime, @Param("endTime")String endTime);
+		@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);
 	
 	
 	/**
@@ -32,8 +33,8 @@
 	 * @return
 	 */
 	long countGroupOrderNoByUid(@Param("uid") Long uid, @Param("state") Integer state, 
-		@Param("type") Integer type, @Param("orderNo")String orderNo,
-		@Param("startTime")String startTime, @Param("endTime")String endTime);
+		@Param("type") Integer type,@Param("orderState")Integer orderState,@Param("orderNo")String orderNo,
+		@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("day")Integer day);
 	
 	/**
 	 * 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
@@ -70,21 +71,5 @@
 	 * @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