From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
index 71305fd..11b80d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
@@ -1,7 +1,9 @@
package com.yeshi.fanli.dao.mybatis.hongbao;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
import org.apache.ibatis.annotations.Param;
@@ -140,6 +142,15 @@
int getCountByUid(@Param("uid") Long uid);
/**
+ * 缁熻宸茬粡鍒拌处鐨勮鍗曟暟閲�
+ *
+ * @param uid
+ * @param state
+ * @return
+ */
+ int getCountByUidAndState(@Param("uid") Long uid, @Param("state") int state);
+
+ /**
* 缁熻璁板綍 澶辨晥璁㈠崟鏁�
*
* @param uid
@@ -242,4 +253,36 @@
List<HongBao> listShareAndInviteMoney(@Param("start") long start, @Param("count") int count,
@Param("date") String date);
+ /**
+ * 缁熻鐢ㄦ埛绾㈠寘鏁伴噺
+ * @param uid
+ * @param type
+ * @param state
+ * @param minTime
+ * @param maxTime
+ * @return
+ */
+ long selectCountByTypeAndStateAndCreateTime(@Param("uid") Long uid, @Param("type") List<Integer> type,
+ @Param("state") List<Integer> state, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛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);
+
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+ * @param channel
+ * @return
+ */
+ List<Map<String, Object>> countHistoryOderByChannel(@Param("channel")String channel,
+ @Param("type")Integer type, @Param("years") String years,
+ @Param("startTime")String startTime, @Param("endTime")String endTime);
+
}
\ No newline at end of file
--
Gitblit v1.8.0