From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   73 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 18 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 6554b5f..f92fb29 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
@@ -11,65 +11,102 @@
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
-	
+
 	/**
 	 * 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
 	 * @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("orderState") Integer orderState, @Param("orderNo")String orderNo,
-		 @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("day")Integer day);
-	
-	
+
+	List<CommonOrderVO> listGroupOrderNoByUid(@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);
+
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
 	 * @return
 	 */
-	long countGroupOrderNoByUid(@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 countGroupOrderNoByUid(@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
+	 * @return
+	 */
+
+	Map<String, Object> countMoneyGroupOrderNoByUid(@Param("uid") Long uid, @Param("type") Integer type, @Param("orderNo") String orderNo,
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
+	/**
 	 * 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
-	 * @param list 璁㈠崟瀵硅薄
+	 * 
+	 * @param list
+	 *            璁㈠崟瀵硅薄
 	 * @return
 	 */
 	List<CommonOrderVO> listByOrderNoAndType(List<CommonOrderVO> list);
-	
+
 	/**
 	 * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	Map<String, BigDecimal> countOrderByHongBaoType(@Param("uid") Long uid, @Param("day") Integer day);
-	
+
 	/**
 	 * 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
-	
+
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
+
 	/**
 	 * 濂栭噾璁㈠崟鏁伴噺
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	long countBonusOrder(@Param("uid")Long uid, @Param("type") Integer type,	@Param("day")Integer day);
-	
+	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);
+	BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
+
+	int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
+
+	/**
+	 * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟鎺掑簭鍊艰幏鍙栬鎯�
+	 * 
+	 * @param orderNo
+	 *            -璁㈠崟鍙�
+	 * @param orderBy
+	 *            -璁㈠崟鎺掑簭鍊�
+	 * @param orderType
+	 *            -璁㈠崟绫诲瀷
+	 * @return
+	 */
+	CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
+			@Param("orderType") int orderType, @Param("orderBy") int orderBy);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0