From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index c63fe75..63d9c06 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.push;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -229,7 +230,13 @@
if (goodsList == null || goodsList.size() == 0) {
throw new PushException(1, "鎺ㄩ�佹棤鍟嗗搧,璇峰畬鍠勬暟鎹�");
}
-
+
+ List<String> listVersion = null;
+ String versions = pushGoods.getVersions();
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
if (goodsList.size() == 1) {
/* 鍗曚釜鍟嗗搧鎺ㄩ�侊細 鐩存帴澶勭悊涓哄晢鍝佷俊鎭� */
PushGoodsGroup pushGoodsGroup = goodsList.get(0);
@@ -240,9 +247,9 @@
Long goodsId = commonGoods.getGoodsId();
String url = "https://item.taobao.com/item.htm?id=" + goodsId;
+
+ pushService.pushGoods(pushGoods.getUid(), url, alertTitle, alertContent, listVersion);
- pushService.pushGoods(pushGoods.getUid(), url, alertTitle, alertContent);
-
} else {
/* 澶氫釜鍟嗗搧鎺ㄩ�� */
String url = configService.get("push_goods_details");
@@ -252,7 +259,7 @@
// 鐢熸垚閾炬帴
url = url + "?id=" + id;
- pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent);
+ pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent, listVersion);
}
// 宸叉帹閫�
--
Gitblit v1.8.0