From 7b3994d42861437494156d7d7b4e987068f3682c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:09:10 +0800
Subject: [PATCH] vip 自动升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 aaa5759..0decc79 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,8 +278,20 @@
 
 
 	@Override
-	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
-		MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鏀剁泭");
+	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, "鍥㈤槦鏀剁泭");
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {

--
Gitblit v1.8.0