From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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 045892c..9887052 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
@@ -3,10 +3,10 @@
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.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountMapper {
@@ -49,7 +49,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoMoney(@Param("channel") String channel, @Param("dateType") Integer dateType,
+ List<ChartTDO> 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);
@@ -65,7 +65,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoNum(@Param("channel") String channel, @Param("dateType") Integer dateType,
+ List<ChartTDO> 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);
@@ -81,7 +81,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoType(@Param("dateType") Integer dateType, @Param("type") Integer type,
+ List<ChartTDO> countHongBaoType(@Param("dateType") Integer dateType, @Param("type") Integer type,
@Param("year") String year, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -96,11 +96,15 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
int getTotalTiChengCount(Long uid);
+
+
+ // 绱鎻愭垚绾㈠寘鏁伴噺锛堝寘鍚棤鏁堬級
+ long getHongBaoCount(@Param("uid") Long uid, @Param("type") Integer type);
/**
* 缁熻鏈け鏁堣鍗曟暟閲�
@@ -127,7 +131,7 @@
* @param channel
* @return
*/
- List<Map<String, Object>> count24HOderByChannel(@Param("channel") String channel, @Param("type") Integer type,
+ List<ChartTDO> 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,
@@ -169,5 +173,54 @@
* @return
*/
long countShareOrInviteOrder(@Param("uid") Long uid);
+
+ /**
+ * 缁熻涓嬬骇浜х敓鏈夋晥鍒嗕韩濂栭噾
+ * @param uid
+ * @param teamUid 涓嬬骇id
+ * @param endTime 缁撴潫鏃堕棿
+ * @return
+ */
+ BigDecimal getOrderRewardByTeamUid(@Param("uid") Long uid, @Param("teamUid") Long teamUid, @Param("endTime") Date endTime);
+
+ /**
+ * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+ * @param uid
+ * @param teamUid 涓嬬骇id
+ * @param endTime 缁撴潫鏃堕棿
+ * @return
+ */
+ BigDecimal getOrderRewardByTeamUidTheMonth(@Param("uid") Long uid, @Param("teamUid") Long teamUid);
+
+ /**
+ * 缁熻宸插埌璐﹂噾棰�
+ * @param uid
+ * @param list 绫诲瀷
+ * @return
+ */
+ BigDecimal getRewardMoneyByUid(@Param("uid") Long uid, @Param("list") List<Integer> list);
+
+ /**
+ * 娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param list 绫诲瀷
+ * @return
+ */
+ long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,
+ @Param("payment") BigDecimal payment);
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
+ * @param uid
+ * @param dateType 鏃ユ湡绫诲瀷
+ * @param hbType 绾㈠寘绫诲瀷
+ * @return
+ */
+ BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType,
+ @Param("type") Integer hbType, @Param("orderState") Integer orderState,
+ @Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,
+ @Param("source") Integer source,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
}
\ No newline at end of file
--
Gitblit v1.8.0