From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java
index f3e4b05..0d43286 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java
@@ -49,26 +49,35 @@
* @return
*/
List<InviteOrderSubsidy> listByOrderNoAndType(@Param("orderNo") String orderNo, @Param("type") Integer type);
-
+
+ List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(@Param("orderNo") String orderNo, @Param("type") Integer type,
+ @Param("uid") Long uid);
InviteOrderSubsidy selectByPrimaryKeyForUpdate(Long id);
-
-
-
+
/**
* 缁熻鐢ㄦ埛宸插埌璐﹂噾棰�
* @param uid
* @return
*/
BigDecimal sumRecievedMoneyByUid(@Param("uid") long uid, @Param("level") Integer level);
-
-
+
/**
* 缁熻鐢ㄦ埛鏈夋晥閲戦
* @param uid
* @param day 1浠婃棩 2鏄ㄦ棩 3鏈湀 4涓婃湀
* @return
*/
- BigDecimal sumValidMoneyByUidAndDate(@Param("uid") long uid, @Param("day") Integer day, @Param("level") Integer level);
-
+ BigDecimal sumValidMoneyByUidAndDate(@Param("uid") long uid, @Param("day") Integer day,
+ @Param("level") Integer level);
+
+ /**
+ * 缁熻鐢ㄦ埛鏈夋晥閲戦
+ * @param uid
+ * @param day 1浠婃棩 2鏄ㄦ棩 3鏈湀 4涓婃湀
+ * @return
+ */
+ BigDecimal sumMoneyByUidAndDateAndState(@Param("uid") long uid, @Param("day") Integer day,
+ @Param("level") Integer level, @Param("state") Integer state);
+
}
\ No newline at end of file
--
Gitblit v1.8.0