From 2ee706784c5d20c1cb70855346476745d3e13970 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 23 二月 2020 18:30:13 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 9538737..5097d47 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -738,34 +738,26 @@
return;
}
- int total = 0;
- for (ImgInfo imgInfo : imgs) {
- SimpleGoods goods = imgInfo.getGoods();
- if (goods != null) {
- total++;
- }
- }
-
List<String> list = new ArrayList<>();
for (ImgInfo imgInfo : imgs) {
GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
- if (goodsVO == null && total <= 1) {
+ if (goodsVO == null) {
list.add(imgInfo.getUrl());
continue;
}
if (type == 1) {
+ String jumpLink = getJumpLink(goodsVO, user, inviteCode);
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ } else {
if (goodsVO.getGoodsId().longValue() == goodsId.longValue()
&& goodsVO.getGoodsType() == goodsType.intValue()) {
String jumpLink = getJumpLink(goodsVO, user, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
- }
- } else {
- String jumpLink = getJumpLink(goodsVO, user, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
}
}
}
@@ -801,6 +793,7 @@
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
+ jumpLink = url;
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
if (jdGoods == null) {
--
Gitblit v1.8.0