From 588607eeb4168f6f5734fdc91bb3dfd101eeb4eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 15:04:33 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
index c108b04..dc5fd13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
@@ -7,6 +7,7 @@
 public interface PushService {
 	/**
 	 * 鎺ㄩ�佸晢鍝�
+	 * 
 	 * @param uid
 	 * @param url
 	 * @param title
@@ -15,11 +16,12 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,
-			List<String> listAndroid) throws PushException;
+	void pushGoods(Long uid, String title, String content, String url, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
+	 * 
 	 * @param uid
 	 * @param url
 	 * @param title
@@ -28,11 +30,12 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,
-			List<String> listAndroid) throws PushException;
+	void pushUrl(Long uid, String title, String content, String url, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
+	 * 
 	 * @param uId
 	 * @param title
 	 * @param content
@@ -40,11 +43,12 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, String title, String content, List<String> listIOS,
-			List<String> listAndroid) throws PushException;
+	void pushZNX(Long uId, String title, String content, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
+	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
@@ -58,6 +62,7 @@
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
+	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
@@ -71,6 +76,7 @@
 
 	/**
 	 * 鎺ㄩ�佺鍒╀腑蹇�
+	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
@@ -78,6 +84,19 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushWelfareCenter(Long uid, String title, String content,List<String> listIOS,
+	void pushWelfareCenter(Long uid, String title, String content, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
+
+	/**
+	 * 鎺ㄩ�佺鍒伴�氱煡
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
+	 * @throws PushException
+	 */
+	void pushUserSignInNotification(Long uid, String title, String content, List<String> listIOS,
 			List<String> listAndroid) throws PushException;
 }

--
Gitblit v1.8.0