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/BasePushService.java |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java
index aa5c72f..341b4e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java
@@ -2,7 +2,7 @@
 
 import com.yeshi.fanli.entity.bus.user.AccountMessage;
 import com.yeshi.fanli.entity.system.SystemZnx;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
 
 public interface BasePushService {
 	/**
@@ -14,7 +14,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, Long auctionId, String title, String content) throws PushException;
+	void pushGoods(Long uid, Long auctionId, String title, String content, String versions) throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
@@ -25,7 +25,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String url, String title, String content) throws PushException;
+	void pushUrl(Long uid, String url, String title, String content, String versions) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
@@ -35,28 +35,48 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, AccountMessage msg,SystemZnx systemZNX) throws PushException;
-	
+	void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, String versions) throws PushException;
+
 	/**
-	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚�
-	 * 鎺ㄩ�亀eex椤甸潰
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
+	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
 	 * @param weexUrl
 	 * @throws PushException
 	 */
-	void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException;
-	
-	
+	void pushWEEX(Long uid, String title, String content, String weexUrl, String versions) throws PushException;
+
 	/**
-	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚�
-	 * 鎺ㄩ�佺櫨宸濈綉椤�
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
+	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
 	 * @param url
 	 * @throws PushException
 	 */
-	void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException;
+	void pushBaiChuanUrl(Long uid, String title, String content, String url, String versions) throws PushException;
+
+	/**
+	 * 鎺ㄩ�佺鍒╀腑蹇冿紙鐗堟湰鍙�:1.5.1鍚庯級
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @throws PushException
+	 */
+	void pushWelfareCenter(Long uid, String title, String content, String versions) throws PushException;
+
+	/**
+	 * 鎺ㄩ�佺敤鎴风鍒�
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param versions
+	 * @throws PushException
+	 */
+	void pushUserSignInNotification(Long uid, String title, String content, String versions) throws PushException;
 }

--
Gitblit v1.8.0