From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 cb0d725..2a68170 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
@@ -37,7 +37,7 @@
@Override
public void extractApplay(Extract extract) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("浜哄伐瀹℃牳涓�", extract.getUserInfo().getId(), extract,
- null, null);
+ null, null, "瀹℃牳灏嗕細鍦�24灏忔椂鍐呭畬鎴�");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -48,7 +48,7 @@
@Override
public void extractFail(Extract extract, String reason) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇澶辫触", extract.getUserInfo().getId(), extract,
- reason, null);
+ reason, null, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -59,12 +59,13 @@
@Override
public void extractSuccess(Extract extract, String alipayNo) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇鎴愬姛", extract.getUserInfo().getId(), extract,
- null, alipayNo);
+ null, alipayNo, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
e.printStackTrace();
}
+
PushContentDTO dto = PushMsgFactory.createMoneyExtractSuccess(new Date(extract.getExtractTime()),
extract.getMoney(), extract.getAccount());
try {
--
Gitblit v1.8.0