From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 49aaf9a..06ea48a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -3,8 +3,8 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountService {
@@ -52,7 +52,7 @@
* 缁撴潫鏃堕棿
* @return
*/
- public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ public List<ChartTDO> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
/**
@@ -72,7 +72,7 @@
* 缁撴潫鏃堕棿
* @return
*/
- public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
+ public List<ChartTDO> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
/**
@@ -86,7 +86,7 @@
* @return
* @throws Exception
*/
- public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year, String startTime,
+ public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception;
/**
@@ -123,7 +123,7 @@
*/
public Date getLastHongBaoTime(Long uid);
- public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+ public List<ChartTDO> count24HOderByChannel(String channel, Integer type, String years, String startTime,
String endTime) throws Exception;
/**
@@ -137,7 +137,7 @@
* @return
* @throws Exception
*/
- public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
+ public List<ChartTDO> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception;
/**
@@ -184,4 +184,107 @@
public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
+ /**
+ * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟
+ * @param uid
+ * @param teamUid
+ * @param endTime
+ * @return
+ */
+ public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime);
+
+ /**
+ * 缁熻璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟
+ * @param uid
+ * @param teamUid 涓嬬骇id
+ * @return
+ */
+ public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid);
+
+ /**
+ * 鑷喘杩斿埄鍒拌处閲戦
+ * @param uid
+ * @return
+ */
+ public BigDecimal getRewardMoneyBySelf(Long uid);
+
+ /**
+ * 鍒嗕韩濂栧姳鍒拌处閲戦
+ * @param uid
+ * @return
+ */
+ public BigDecimal getRewardMoneyByShare(Long uid);
+
+ /**
+ * 涓嬬骇浜х敓濂栧姳鍒拌处閲戦
+ * @param uid
+ * @return
+ */
+ public BigDecimal getRewardMoneyByInvite(Long uid);
+
+ /**
+ * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param date
+ * @param payment
+ * @return
+ */
+ public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
+
+ /**
+ * 缁熻涓嶅悓鏃堕棿锛氬鍔�
+ * @param uid
+ * @param dateType
+ * @param hbType
+ * @return
+ */
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource);
+
+ /**
+ * 缁熻绾㈠寘涓暟
+ * @param uid
+ * @param type 绾㈠寘绫诲瀷
+ * @return
+ */
+ public long getHongBaoCount(Long uid, Integer type);
+
+ /**
+ * 绛涢�夌粨鏋滈〉椤堕儴缁熻
+ * @param uid
+ * @param dateType
+ * @param hbType
+ * @param orderState
+ * @param orderNo
+ * @param source
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
+ Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+
+
+ public Long countOrderByTypeAndDate(Integer orderType, String preDay);
+
+ /**
+ * 缁熻璁㈠崟鏁伴噺
+ * @param uid
+ * @param time 涓嬪崟寮�濮嬫椂闂�
+ * @param payment 浠樻閲戦
+ * @param type 璁㈠崟绫诲瀷
+ * @return
+ */
+ public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+
+ /**
+ * 缁熻宸茬粨绠�
+ * @param uid
+ * @param time
+ * @param payment
+ * @return
+ */
+ public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
+
+ public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+
}
--
Gitblit v1.8.0