From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 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 7907995..c4107cb 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
@@ -133,29 +133,24 @@
*/
BigDecimal getRewardMoneyByUid(@Param("uid") Long uid, @Param("list") List<Integer> list);
- /**
- * 娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
- * @param uid
- * @param list 绫诲瀷
- * @return
- */
- Long countValidOrderByUidAndTime(@Param("uid") Long uid, @Param("limitTime") long limitTime,
- @Param("payment") BigDecimal payment);
-
-
- Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("limitTime") long limitTime,
- @Param("payment") BigDecimal payment);
-
/**
* 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
* @param uid
- * @param list 绫诲瀷
+ * @param payment
* @return
*/
- Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
- @Param("type") int type);
+ Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type);
+ /**
+ * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param payment
+ * @return
+ */
+ Long countMyDirectOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type")Integer type);
/**
@@ -168,7 +163,8 @@
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("startTime") String startTime, @Param("endTime") String endTime,@Param("listSource") List<Integer> listSource);
+ @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);
/**
* 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟
@@ -179,4 +175,30 @@
Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+ /**
+ * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
+ * @param uid
+ * @param day
+ * @return
+ */
+ BigDecimal sumMoneyArrivalByUidAndNearDay(@Param("uid") Long uid, @Param("day") int day);
+
+
+ /**
+ * 缁熻缁撶畻閲戦
+ * @param uid
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ BigDecimal sumMoneyBySettleTimeAndUid(@Param("uid") Long uid, @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+
+ /**
+ * 180鍐呮湭鏀惰揣鐨勯噾棰�
+ * @param uid
+ * @return
+ */
+ BigDecimal sumMoneyByANotSettleAndUid(@Param("uid") Long uid);
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0