From a6e138ae919e6048fa26472c31336123f3d78106 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 09 八月 2019 15:56:24 +0800
Subject: [PATCH] 积分

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |  155 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 142 insertions(+), 13 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 2efbbb6..c7f8f88 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
@@ -22,10 +22,10 @@
 	 * @return
 	 */
 
-	List<CommonOrderVO> listUserOrder(@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> listUserOrder(@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("source")Integer source);
 
 	/**
 	 * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -37,8 +37,16 @@
 	 */
 	long countUserOrder(@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("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day, @Param("source")Integer source);
 
+	/**
+	 * 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
+	 * 
+	 * @param uid
+	 * @param orderNo
+	 * @return
+	 */
+	CommonOrderVO getBuFenOrderState(@Param("uid") Long uid, @Param("orderNo") String orderNo);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
@@ -49,7 +57,8 @@
 	 * @param maxDate
 	 * @return
 	 */
-	long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid")Long uid, @Param("state")int state,@Param("minDate") Date minDate,@Param("maxDate") Date maxDate);
+	long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid") Long uid, @Param("state") int state,
+			@Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
@@ -66,7 +75,7 @@
 	 * @param uid
 	 * @return
 	 */
-	Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day);
+	Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day, @Param("source") Integer source);
 
 	/**
 	 * 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -75,7 +84,8 @@
 	 * @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);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day, 
+			@Param("source")Integer source);
 
 	/**
 	 * 濂栭噾璁㈠崟鏁伴噺
@@ -84,7 +94,7 @@
 	 * @return
 	 */
 	long countBonusOrderNumber(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
-			@Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
 
 	/**
 	 * 濂栭噾缁熻
@@ -93,12 +103,18 @@
 	 * @return
 	 */
 	BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
-			@Param("startTime") String startTime, @Param("endTime") String endTime);
-	
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);
 
-	
+	/**
+	 * 濂栭噾缁熻
+	 * 
+	 * @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, @Param("source")Integer source);
+
 	int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
-
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟鎺掑簭鍊艰幏鍙栬鎯�
@@ -114,4 +130,117 @@
 	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, @Param("source")Integer source);
+
+	/**
+	 * 缁熻
+	 */
+	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, @Param("source")Integer source);
+
+	/**
+	 * 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
+	 * 
+	 * @param sourceType
+	 * @param orderNo
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndOrderNo(@Param("sourceType") int sourceType, @Param("orderNo") String orderNo);
+
+	/**
+	 * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+	 * 
+	 * @param uid
+	 * @param state
+	 * @param orderNo
+	 * @return
+	 */
+	List<CommonOrderVO> getCouponHongbaoByOrderNo(@Param("uid") Long uid, @Param("hongBaoState") Integer hongBaoState,
+			@Param("orderNo") String orderNo);
+
+	/**
+	 * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+	 * 
+	 * @param uid
+	 * @param state
+	 * @param orderNo
+	 * @return
+	 */
+	CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo,
+			@Param("orderState") Integer orderState, @Param("sourceType") Integer sourceType);
+
+	/**
+	 * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟璇︽儏
+	 * 
+	 * @param sourceType
+	 * @param tradeId
+	 * @return
+	 */
+
+	CommonOrder selectBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+
+	/**
+	 * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟鍒楄〃
+	 * 
+	 * @param sourceType
+	 * @param tradeId
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+
+	/**
+	 * 
+	 * @param sourceType
+	 * @param state
+	 * @param minTime
+	 *            -鏈�澶у垱寤烘椂闂�
+	 * @param maxTime
+	 *            -鏈�灏忓垱寤烘椂闂�
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
+			@Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
+			@Param("start") long start, @Param("count") int count);
 }
\ No newline at end of file

--
Gitblit v1.8.0