From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 81af659..d782e60 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -404,7 +404,7 @@
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(taobaoLink.getGoods().getAuctionId());
history.setPostPicture(taobaoLink.getGoods().getPictUrl());
-
+ history.setShareImg(taobaoLink.getClickUrl());
List<String> imgList = taobaoLink.getGoods().getImgList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -585,7 +585,7 @@
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(finalGoods.getAuctionId());
history.setPostPicture(finalGoods.getPictUrl());
-
+ history.setShareImg(taobaoLink.getClickUrl());
List<String> imgList = finalGoods.getImgList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -718,7 +718,8 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getPicUrl());
-
+ history.setShareImg(jumpLink);
+
List<String> imgList = goods.getImageList();
if (imgList == null) {
imgList = new ArrayList<>();
@@ -843,7 +844,7 @@
history.setQuanLink(null);
history.setGoodsId(goodsId);
history.setPostPicture(goods.getGoodsImageUrl());
-
+ history.setShareImg(jumpLink);
List<String> imgList = null;
String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
if (goodsGalleryUrls != null) {
--
Gitblit v1.8.0