From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 f3b0035..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
@@ -8,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> {
@@ -93,4 +94,14 @@
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