From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
index 117fde4..051e971 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
@@ -39,7 +39,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getNewerHongbaoTitle(),
-					Constant.znxConfig.getNewerHongbaoMsg().replace("[閲戦]", money.toString()));
+					Constant.znxConfig.getNewerHongbaoMsg().replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -51,7 +51,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getOrderFanliRecieveTitle(), Constant.znxConfig
-					.getOrderFanliRecieveMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+					.getOrderFanliRecieveMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -63,7 +63,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),
-					Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()));
+					Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -76,7 +76,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
-					Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId));
+					Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -89,7 +89,7 @@
 		orderId = orderId.substring(0, orderId.length() - 6) + "******";
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getTichengOrderStatisticedTitle(), Constant.znxConfig
-					.getTichengOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+					.getTichengOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -131,7 +131,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getExtractApplayTitle(),
-					Constant.znxConfig.getExtractApplayMsg());
+					Constant.znxConfig.getExtractApplayMsg(), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -143,7 +143,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getExtractTransferFailTitle(),
-					Constant.znxConfig.getExtractTransferFailMsg().replace("[鏃堕棿]", time));
+					Constant.znxConfig.getExtractTransferFailMsg().replace("[鏃堕棿]", time), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -170,7 +170,7 @@
 
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getExtractWrongTitle(),
-					Constant.znxConfig.getExtractWrongMsg().replace("[鏃堕棿]", time));
+					Constant.znxConfig.getExtractWrongMsg().replace("[鏃堕棿]", time), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -198,7 +198,7 @@
 
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getExtractSuccessTitle(),
-					Constant.znxConfig.getExtractSuccessMsg().replace("[鏃堕棿]", time));
+					Constant.znxConfig.getExtractSuccessMsg().replace("[鏃堕棿]", time), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -228,7 +228,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getInviteMoneyRecieveTitle(),
-					Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[閲戦]", money.toString()));
+					Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -241,7 +241,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),
-					Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()));
+					Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -256,7 +256,7 @@
 		orderId = orderId.substring(0, orderId.length() - 6) + "******";
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getShareOrderStatisticedTitle(), Constant.znxConfig
-					.getShareOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+					.getShareOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -271,7 +271,7 @@
 		orderId = orderId.substring(0, orderId.length() - 6) + "******";
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getInviteOrderStatisticedTitle(), Constant.znxConfig
-					.getInviteOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+					.getInviteOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}

--
Gitblit v1.8.0