From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 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..b2da8c8 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
@@ -39,7 +39,15 @@
 			@Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
 
-
+	/**
+	 * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
+	 * @param uid
+	 * @param orderNo
+	 * @return
+	 */
+	CommonOrderVO getBuFenOrderState(@Param("uid") Long uid,  @Param("orderNo") String orderNo);
+	
+	
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
 	 * 
@@ -75,7 +83,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 +103,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 +134,58 @@
 	 */
 	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);
+
+	
+	/**
+	 * 璁㈠崟鍒楄〃鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	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);
+
+	/**
+	 * 缁熻
+	 */
+	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);
+
 
 }
\ No newline at end of file

--
Gitblit v1.8.0