From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
index d6cd109..3355e84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/BindingAccountServiceImpl.java
@@ -135,7 +135,6 @@
 						"璇ユ敮浠樺疂璐﹀彿宸茶鍏朵粬璐﹀彿缁戝畾锛岃鏇存崲鍏朵粬鐨勬敮浠樺疂璐﹀彿鏉ョ粦瀹�");
 		}
 
-		// TODO 鍋氶鐜囬獙璇�-姣忔湀楠岃瘉涓�娆�
 		AlipayAccountValidNormalHistory latest = alipayAccountValidNormalHistoryMapper.selectLatestByUid(uid);
 		if (latest != null) {
 			Calendar caLatest = Calendar.getInstance();
@@ -177,7 +176,7 @@
 		if (userInfo.getMyHongBao().compareTo(money) >= 0) {
 			// 鎵ｆ
 			userMoneyService.subUserMoney(uid, money, userMoneyDetail);
-			userMoneyMsgNotificationService.alipayAccountValid(history);
+			userMoneyMsgNotificationService.alipayAccountValid(history,"1涓湀",latest!=null);
 		} else {// 浣欓涓嶈冻锛屾殏鏃朵笉鎵ｆ锛屽姞鍏ュ�熻捶鍏崇郴
 			UserMoneyDebt debt = new UserMoneyDebt();
 			debt.setCreateTime(new Date());

--
Gitblit v1.8.0