From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 405429c..5545366 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
@@ -101,6 +101,10 @@
// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
int getTotalTiChengCount(Long uid);
+
+
+ // 绱鎻愭垚绾㈠寘鏁伴噺锛堝寘鍚棤鏁堬級
+ long getHongBaoCount(@Param("uid") Long uid, @Param("type") Integer type);
/**
* 缁熻鏈け鏁堣鍗曟暟閲�
@@ -203,7 +207,19 @@
* @param list 绫诲瀷
* @return
*/
- long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("date") String date,
+ 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("source") Integer source,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
}
\ No newline at end of file
--
Gitblit v1.8.0