From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..ecda896 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;
}
}
}
@@ -246,7 +248,7 @@
// 瀹氭椂鏃堕棿
- if (StringUtil.isNullOrEmpty(record.getControlTime_str())) {
+ if (!StringUtil.isNullOrEmpty(record.getControlTime_str())) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
record.setControlTime(format.parse(record.getControlTime_str().replaceAll("T", " ")));
}
@@ -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