From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |   87 ++++++++-----------------------------------
 1 files changed, 17 insertions(+), 70 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index e8552bb..7907995 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -6,7 +6,6 @@
 
 import org.apache.ibatis.annotations.Param;
 
-import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.vo.order.HongBaoV2VO;
 
 public interface HongBaoV2CountMapper {
@@ -37,67 +36,8 @@
 	 */
 	Long countNumberByUid(@Param("uid") Long uid);
 
-	/**
-	 * 缁熻鎬婚噾棰�
-	 * 
-	 * @param channel
-	 *            娓犻亾
-	 * @param type
-	 * @param state
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<ChartTDO> countHongBaoMoney(@Param("channel") String channel, @Param("dateType") Integer dateType,
-			@Param("state") Integer state, @Param("year") String year, @Param("startTime") String startTime,
-			@Param("endTime") String endTime);
 
-	/**
-	 * 缁熻鎬讳釜鏁�
-	 * 
-	 * @param channel
-	 *            娓犻亾
-	 * @param type
-	 * @param state
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<ChartTDO> countHongBaoNum(@Param("channel") String channel, @Param("dateType") Integer dateType,
-			@Param("state") Integer state, @Param("year") String year, @Param("startTime") String startTime,
-			@Param("endTime") String endTime);
 
-	/**
-	 * 缁熻鎬讳釜鏁�
-	 * 
-	 * @param channel
-	 *            娓犻亾
-	 * @param type
-	 * @param state
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<ChartTDO> countHongBaoType(@Param("dateType") Integer dateType, @Param("type") Integer type,
-			@Param("year") String year, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-	/**
-	 * 缁熻鎬讳釜鏁�
-	 * 
-	 * @param channel
-	 *            娓犻亾
-	 * @param type
-	 * @param state
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<ChartTDO> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
-			@Param("startTime") String startTime, @Param("endTime") String endTime);
 
 	// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
 	int getTotalTiChengCount(Long uid);
@@ -125,14 +65,6 @@
 
 	Date getLastHongBaoTime(@Param("uid") Long uid);
 
-	/**
-	 * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
-	 * 
-	 * @param channel
-	 * @return
-	 */
-	List<ChartTDO> count24HOderByChannel(@Param("channel") String channel, @Param("type") Integer type,
-			@Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 	List<HongBaoV2VO> listShareAndInviteMoney(@Param("start") long start, @Param("count") int count,
 			@Param("date") String date);
@@ -207,8 +139,23 @@
 	 * @param list 绫诲瀷
 	 * @return
 	 */
-	long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,
+	Long countValidOrderByUidAndTime(@Param("uid") Long uid, @Param("limitTime") long limitTime,
 			@Param("payment") BigDecimal payment);
+	
+	
+	Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("limitTime") long limitTime,
+			@Param("payment") BigDecimal payment);
+	
+	
+	/**
+	 *  娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+	 * @param uid
+	 * @param list 绫诲瀷
+	 * @return
+	 */
+	Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+			@Param("type") int type);
+	
 	
 	
 	/**
@@ -229,7 +176,7 @@
 	 * @param preDay
 	 * @return
 	 */
-	Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+	Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
 	
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0