From d21a2d9757a8d57f0fa1d0097709c764924ff08e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
index 0decc79..aaa5759 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -278,20 +278,8 @@
@Override
- public void teamReceive(Long uid, BigDecimal money, BigDecimal subsidy, BigDecimal balance, Date receivedDate) {
- BigDecimal totalMoney = new BigDecimal(0);
- if (money != null) {
- totalMoney = totalMoney.add(money);
- }
- if (subsidy != null) {
- totalMoney = totalMoney.add(subsidy);
- }
-
- if (totalMoney.compareTo(new BigDecimal(0)) <= 0) {
- return;
- }
-
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, totalMoney, balance, receivedDate, "鍥㈤槦鏀剁泭");
+ public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鏀剁泭");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
--
Gitblit v1.8.0