From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 25 九月 2019 12:02:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |  322 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 172 insertions(+), 150 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 25d88c3..045892c 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
@@ -1,151 +1,173 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.vo.order.HongBaoV2VO;
-
-public interface HongBaoV2CountMapper {
-
-	
-	/**
-	 * 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
-	 * @param uid 
-	 * @param state 
-	 * @return
-	 */
-	BigDecimal countMoneyByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
-	
-	
-	/**
-	 * 缁熻鍘嗗彶绾㈠寘鏁伴噺
-	 * @param uid 
-	 * @param state 
-	 * @return
-	 */
-	Integer countNumberByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
-	
-	/**
-	 * 缁熻鐢ㄦ埛鎬荤殑绾㈠寘鏁伴噺
-	 * @param uid
-	 * @return
-	 */
-	Long countNumberByUid(@Param("uid")Long uid);
-	
-	/**
-	 * 缁熻鎬婚噾棰�
-	 * @param channel 娓犻亾
-	 * @param type 
-	 * @param state
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> countHongBaoTotalNum(@Param("dateType")Integer dateType, @Param("year") String year,
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
-	
-	// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
-	int getTotalTiChengCount(Long uid);
-	
-	/**
-	 * 缁熻鏈け鏁堣鍗曟暟閲�
-	 * @param uid
-	 * @param dateType
-	 * @return
-	 */
-	long countValidNumberByUid(@Param("uid") Long uid, @Param("dateType")Integer dateType);
-	
-	/**
-	 * 缁熻鏈埌璐�
-	 * @param uid
-	 * @return
-	 */
-	BigDecimal countWillGetMoneyByUid(@Param("uid") Long uid);
-	
-	
-	Date getLastHongBaoTime(@Param("uid") Long uid);
-	
-	
-	/**
-	 * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
-	 * 
-	 * @param channel
-	 * @return
-	 */
-	List<Map<String, Object>> 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);
-	
-	
-	/**
-	 * 缁熻濂栧姳鍒告�婚噾棰�
-	 * @return
-	 */
-	BigDecimal countRebateCouponMoney();
-	
-	
-	/**
-	 * 缁熻杩斿埄璁㈠崟
-	 * @param uid
-	 * @return
-	 */
-	long countRebateOrder(@Param("uid") Long uid);
-	
-	/**
-	 * 缁熻鍒嗕韩鍜岄個璇疯鍗�
-	 * @param uid
-	 * @return
-	 */
-	long countShareOrInviteOrder(@Param("uid") Long uid);
-
+package com.yeshi.fanli.dao.mybatis;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
+
+public interface HongBaoV2CountMapper {
+
+	/**
+	 * 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
+	 * 
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	BigDecimal countMoneyByUidAndState(@Param("uid") Long uid, @Param("state") Integer state);
+
+	/**
+	 * 缁熻鍘嗗彶绾㈠寘鏁伴噺
+	 * 
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	Integer countNumberByUidAndState(@Param("uid") Long uid, @Param("state") Integer state);
+
+	/**
+	 * 缁熻鐢ㄦ埛鎬荤殑绾㈠寘鏁伴噺
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	Long countNumberByUid(@Param("uid") Long uid);
+
+	/**
+	 * 缁熻鎬婚噾棰�
+	 * 
+	 * @param channel
+	 *            娓犻亾
+	 * @param type
+	 * @param state
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
+			@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
+	int getTotalTiChengCount(Long uid);
+
+	/**
+	 * 缁熻鏈け鏁堣鍗曟暟閲�
+	 * 
+	 * @param uid
+	 * @param dateType
+	 * @return
+	 */
+	long countValidNumberByUid(@Param("uid") Long uid, @Param("dateType") Integer dateType);
+
+	/**
+	 * 缁熻鏈埌璐�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal countWillGetMoneyByUid(@Param("uid") Long uid);
+
+	Date getLastHongBaoTime(@Param("uid") Long uid);
+
+	/**
+	 * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+	 * 
+	 * @param channel
+	 * @return
+	 */
+	List<Map<String, Object>> 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);
+
+	/**
+	 * 缁熻濂栧姳鍒告�婚噾棰�
+	 * 
+	 * @return
+	 */
+	BigDecimal countRebateCouponMoney();
+
+	/**
+	 * 缁熻鐢ㄦ埛宸插埌璐�
+	 * 
+	 * @param uid
+	 * @param typeList
+	 * @param minGetTime
+	 * @param maxGetTime
+	 * @return
+	 */
+	BigDecimal sumAlreadyGetMoneyByUid(@Param("uid") Long uid, @Param("typeList") List<Integer> typeList,
+			@Param("minGetTime") Date minGetTime, @Param("maxGetTime") Date maxGetTime);
+
+	long countAlreadyGetMoneyByUid(@Param("uid") Long uid, @Param("typeList") List<Integer> typeList,
+			@Param("minGetTime") Date minGetTime, @Param("maxGetTime") Date maxGetTime);
+
+
+	/**
+	 * 缁熻杩斿埄璁㈠崟
+	 * @param uid
+	 * @return
+	 */
+	long countRebateOrder(@Param("uid") Long uid);
+	
+	/**
+	 * 缁熻鍒嗕韩鍜岄個璇疯鍗�
+	 * @param uid
+	 * @return
+	 */
+	long countShareOrInviteOrder(@Param("uid") Long uid);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0