From 66c70566b5437babca6d01b6c476c7b839aa83ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 11:29:12 +0800
Subject: [PATCH] 修复淘宝授权bug，修复我的页面分享奖金与邀请奖金统计
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 115 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 47 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 9102c9d..8ae78ea 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
@@ -11,109 +11,116 @@
public interface HongBaoV2CountMapper {
-
/**
* 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
- * @param uid
- * @param state
+ *
+ * @param uid
+ * @param state
* @return
*/
- BigDecimal countMoneyByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
-
-
+ BigDecimal countMoneyByUidAndState(@Param("uid") Long uid, @Param("state") Integer state);
+
/**
* 缁熻鍘嗗彶绾㈠寘鏁伴噺
- * @param uid
- * @param state
+ *
+ * @param uid
+ * @param state
* @return
*/
- Integer countNumberByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
-
+ Integer countNumberByUidAndState(@Param("uid") Long uid, @Param("state") Integer state);
+
/**
* 缁熻鐢ㄦ埛鎬荤殑绾㈠寘鏁伴噺
+ *
* @param uid
* @return
*/
- Long countNumberByUid(@Param("uid")Long uid);
-
+ Long countNumberByUid(@Param("uid") Long uid);
+
/**
* 缁熻鎬婚噾棰�
- * @param channel 娓犻亾
- * @param type
+ *
+ * @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);
-
+ 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 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);
-
-
+ 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 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);
-
+ 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 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);
-
+ 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);
-
+ 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灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
*
@@ -122,16 +129,30 @@
*/
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);
}
\ No newline at end of file
--
Gitblit v1.8.0