From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
index 17b462c..96d7ff8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
@@ -66,7 +66,7 @@
@Override
- public void pushGoods(Long uid, String url, String title, String content, List<String> listIOS,
+ public void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,
List<String> listAndroid) throws PushException {
String gids = url.split("id=")[1];
String gid = gids.split("&")[0];
@@ -98,6 +98,7 @@
PushRecord pushRecord = new PushRecord();
+ pushRecord.setUid(uid);
pushRecord.setState(1);
pushRecord.setType(PushController.GOODS); // 閮芥垚鍔�
pushRecord.setUrl(url);
@@ -110,7 +111,7 @@
@Override
- public void pushUrl(Long uid, String url, String title, String content, List<String> listIOS,
+ public void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,
List<String> listAndroid) throws PushException {
if (StringUtil.isNullOrEmpty(url))
@@ -142,6 +143,7 @@
PushRecord pushRecord = new PushRecord();
+ pushRecord.setUid(uid);
pushRecord.setState(1);
pushRecord.setType(PushController.URL);
pushRecord.setUrl(url);
--
Gitblit v1.8.0