From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 1aa616d..9102c9d 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
@@ -7,6 +7,8 @@
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
+
 public interface HongBaoV2CountMapper {
 
 	
@@ -26,6 +28,13 @@
 	 * @return
 	 */
 	Integer countNumberByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
+	
+	/**
+	 * 缁熻鐢ㄦ埛鎬荤殑绾㈠寘鏁伴噺
+	 * @param uid
+	 * @return
+	 */
+	Long countNumberByUid(@Param("uid")Long uid);
 	
 	/**
 	 * 缁熻鎬婚噾棰�
@@ -104,4 +113,25 @@
 	
 	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();
+	
+
 }
\ No newline at end of file

--
Gitblit v1.8.0