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/inter/push/PushService.java |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 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 2129dc0..de991f2 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
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
 
 public interface PushService {
 	/**
@@ -12,9 +12,12 @@
 	 * @param url
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, String url, String title, String content, List<String> listVersion) throws PushException;
+	void pushGoods(Long uid, String title, String content, String url, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
@@ -23,9 +26,12 @@
 	 * @param url
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException;
+	void pushUrl(Long uid, String title, String content, String url, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
@@ -33,9 +39,12 @@
 	 * @param uId
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, String title, String content, List<String> listVersion) throws PushException;
+	void pushZNX(Long uId, String title, String content, List<String> listIOS, List<String> listAndroid)
+			throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
@@ -44,9 +53,12 @@
 	 * @param title
 	 * @param content
 	 * @param weexUrl
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException;
+	void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
@@ -55,9 +67,12 @@
 	 * @param title
 	 * @param content
 	 * @param url
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException;
+	void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺鍒╀腑蹇�
@@ -65,7 +80,23 @@
 	 * @param uid
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException;
+	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