From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
index 0ba91ce..b63f195 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.mybatis.money;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -7,6 +8,7 @@
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.vo.money.UserMonthMoneyVO;
public interface UserMoneyDetailMapper extends BaseMapper<UserMoneyDetail> {
@@ -65,17 +67,41 @@
* @return
*/
List<UserMonthMoneyVO> selectMonthMoneyByUid(@Param("uid") Long uid, @Param("dateFormat") List<String> dateFormat);
-
+
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇璧勯噾鏄庣粏锛堣�佺増锛�
+ *
* @param uid
* @param start
* @param count
* @return
*/
- List<UserMoneyDetail> selectByUidWithState(@Param("uid")Long uid,@Param("start") long start, @Param("count")int count);
-
- Long selectCountByUidWithState(@Param("uid")Long uid);
+ List<UserMoneyDetail> selectByUidWithState(@Param("uid") Long uid, @Param("start") long start,
+ @Param("count") int count);
+
+ Long selectCountByUidWithState(@Param("uid") Long uid);
+
+ /**
+ * 缁熻鏌愪釜鐢ㄦ埛鏌愭鏃堕棿鍐呬骇鐢熺殑鏄庣粏涔嬪拰
+ *
+ * @param uid
+ * @param typeList
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ BigDecimal getTotalMoneyByTypeAndUidWithDate(@Param("uid") Long uid, @Param("typeList") List<String> typeList,
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+
+ /**
+ * 鏍规嵁绫诲瀷锛岀敤鎴稩D锛屽敮涓�鏍囪瘑鏌ヨ
+ * @param type
+ * @param uid
+ * @param sourceIdentifyId
+ * @return
+ */
+ UserMoneyDetail selectByTypeAndUidAndIdentifyCode(@Param("type") UserMoneyDetailTypeEnum type,
+ @Param("uid") Long uid, @Param("sourceIdentifyId") Long sourceIdentifyId);
}
\ No newline at end of file
--
Gitblit v1.8.0