From 47b369e9e644373ca0e6c011a9093868f57e5d92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 02 六月 2020 09:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java
index 3a98bc4..ac9eb5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java
@@ -32,8 +32,8 @@
}
@Override
- public BigDecimal sumMoneyByUidAndDay(Long uid, String day) {
- BigDecimal money = teamDividentsSourceUserMapper.sumMoneyByTargetUidAndDay(uid, day);
+ public BigDecimal sumMoneyByUidAndDay(Long uid, String day,Integer type) {
+ BigDecimal money = teamDividentsSourceUserMapper.sumMoneyByTargetUidAndDayAndType(uid, day,type);
if (money == null)
return new BigDecimal(0);
return money;
--
Gitblit v1.8.0