From cf63bb9b554eabf478af71020bc9b7edc9f4ae6b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 17 五月 2020 19:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 9 +++++----
1 files changed, 5 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 b7c6cbb..60761f4 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
@@ -74,7 +74,7 @@
}
@Override
- public PushGoods selectByPrimaryKey(Long id) throws PushGoodsException {
+ public PushGoods selectByPrimaryKey(Long id) {
return pushGoodsMapper.selectByPrimaryKey(id);
}
@@ -233,8 +233,10 @@
List<ImgInfo> imgList = goodsEvaluate.getImgList();
if (imgList != null && imgList.size() > 0) {
for (ImgInfo imgInfo: imgList) {
- if (imgInfo.getType() == ImgEnum.img && !StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
+ if (!StringUtil.isNullOrEmpty(imgInfo.getUrl()) && StringUtil.isNullOrEmpty(picUrl)
+ && (imgInfo.getType() == ImgEnum.img || imgInfo.getType() == ImgEnum.activity)) {
picUrl = imgInfo.getUrl();
+ break;
}
}
}
@@ -443,8 +445,7 @@
if (StringUtil.isNullOrEmpty(url)) {
throw new PushGoodsException(1, "鎺ㄩ�侀〉闈㈤摼鎺ヤ笉瀛樺湪");
}
- url = url + "?id=" + pushGoods.getId() + "&otherId=" + pushGoods.getOtherId();
-
+ url = url + "?id=" + pushGoods.getId();
// h娲诲姩鍏ㄦ帹
pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);
}
--
Gitblit v1.8.0