From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 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 f6caa0b..48ed1c6 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
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.service.inter.push;
 
+import java.util.List;
+
 import com.yeshi.fanli.entity.bus.user.AccountMessage;
 import com.yeshi.fanli.entity.system.SystemZnx;
 import com.yeshi.fanli.exception.PushException;
@@ -14,7 +16,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, List<String> listVersion) throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
@@ -25,18 +27,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String url, String title, String content) throws PushException;
-
-	/**
-	 * 鎺ㄩ�乄EEX鐨勯〉闈紙鏆傛椂涓嶅仛锛�
-	 * 
-	 * @param uid
-	 * @param weexUrl
-	 * @param title
-	 * @param content
-	 * @throws PushException
-	 */
-	void pushWEEXUrl(Long uid, String weexUrl, String title, String content) throws PushException;
+	void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
@@ -46,5 +37,37 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, AccountMessage msg,SystemZnx systemZNX) throws PushException;
+	void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, List<String> listVersion) throws PushException;
+
+	/**
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param weexUrl
+	 * @throws PushException
+	 */
+	void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException;
+
+	/**
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param url
+	 * @throws PushException
+	 */
+	void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException;
+
+	/**
+	 * 鎺ㄩ�佺鍒╀腑蹇冿紙鐗堟湰鍙�:1.5.1鍚庯級
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @throws PushException
+	 */
+	void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException;
 }

--
Gitblit v1.8.0