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 | 117 +++++++++++++++++++++-------------------------------------
1 files changed, 43 insertions(+), 74 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 e8552bb..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
@@ -6,7 +6,6 @@
import org.apache.ibatis.annotations.Param;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountMapper {
@@ -37,67 +36,8 @@
*/
Long countNumberByUid(@Param("uid") Long uid);
- /**
- * 缁熻鎬婚噾棰�
- *
- * @param channel
- * 娓犻亾
- * @param type
- * @param state
- * @param years
- * @param startTime
- * @param endTime
- * @return
- */
- 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);
- /**
- * 缁熻鎬讳釜鏁�
- *
- * @param channel
- * 娓犻亾
- * @param type
- * @param state
- * @param years
- * @param startTime
- * @param endTime
- * @return
- */
- 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);
- /**
- * 缁熻鎬讳釜鏁�
- *
- * @param channel
- * 娓犻亾
- * @param type
- * @param state
- * @param years
- * @param startTime
- * @param endTime
- * @return
- */
- List<ChartTDO> 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 state
- * @param years
- * @param startTime
- * @param endTime
- * @return
- */
- List<ChartTDO> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
int getTotalTiChengCount(Long uid);
@@ -125,14 +65,6 @@
Date getLastHongBaoTime(@Param("uid") Long uid);
- /**
- * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
- *
- * @param channel
- * @return
- */
- 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,
@Param("date") String date);
@@ -201,14 +133,24 @@
*/
BigDecimal getRewardMoneyByUid(@Param("uid") Long uid, @Param("list") List<Integer> list);
+
/**
- * 娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
* @param uid
- * @param list 绫诲瀷
+ * @param payment
* @return
*/
- long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,
- @Param("payment") BigDecimal payment);
+ 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);
/**
@@ -221,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);
/**
* 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟
@@ -229,7 +172,33 @@
* @param preDay
* @return
*/
- Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+ 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