From 7b7536f2923b5ce06d4b69b22c16e1a4946bf16b Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 03 三月 2020 15:15:18 +0800
Subject: [PATCH] 小程序商品详情更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 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 6b89a94..673a3f0 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
@@ -33,7 +33,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
-import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
@@ -123,7 +122,7 @@
@Resource
private QrCodeService qrCodeService;
-
+
@Resource
private ConvertLinkManager convertLinkManager;
@@ -240,7 +239,7 @@
// 2.0.7杩斿洖鍙戝湀+娲诲姩+瀛﹂櫌+绱犳潗
list.add(map.get(TYPE_FAQUAN));
list.add(map.get(TYPE_HUODONG));
- // list.add(map.get(TYPE_XUEYUAN));
+// list.add(map.get(TYPE_XUEYUAN));
list.add(map.get(TYPE_SUCAI));
} else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -590,6 +589,7 @@
*/
@RequestMapping(value = "getDynamicList", method = RequestMethod.POST)
public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, PrintWriter out) {
+
try {
int type = 1;
if (cid == TYPE_FAQUAN){
@@ -773,7 +773,7 @@
continue;
}
- String jumpLink = getJumpLink(goodsVO, user,relationId, inviteCode);
+ String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -785,7 +785,7 @@
if (imgInfo.getGoodsVO() != null)
if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
&& imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user,relationId, inviteCode);
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -795,7 +795,7 @@
} else if (type == 2 || type == 3) {
for (ImgInfo imgInfo : imgs) {
if (imgInfo.getGoodsVO() != null) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user,relationId, inviteCode);
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -816,7 +816,6 @@
}
}
}
-
Integer shareCount = goodsEvaluate.getShareNum();
if (shareCount == null) {
@@ -838,21 +837,22 @@
data.put("list", list);
out.print(JsonUtil.loadTrueResult(data));
}
-
+
@Resource
private ShareGoodsService shareGoodsService;
- private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user,String relationId, String inviteCode) {
+ private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode) {
String jumpLink = null;
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- TaoBaoLink taoBaoLink=null;
+ TaoBaoLink taoBaoLink = null;
try {
taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(user.getId(), goodsVO.getGoodsId(), relationId);
} catch (ShareGoodsException e) {
e.printStackTrace();
}
-
- jumpLink =configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()).replace("[娣樺彛浠", taoBaoLink.getTaoToken());
+
+ jumpLink = configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()).replace("[娣樺彛浠",
+ taoBaoLink.getTaoToken());
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
if (jdGoods == null) {
@@ -933,12 +933,12 @@
}
}
}
-
+
try {
- text=convertLinkManager.convertLinkFromText(text, uid, true);
+ text = convertLinkManager.convertLinkFromText(text, uid, true);
} catch (Exception e) {
e.printStackTrace();
- out.print(JsonUtil.loadFalseResult("杞摼澶辫触"));
+ out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
return;
}
@@ -946,6 +946,5 @@
data.put("text", text);
out.print(JsonUtil.loadTrueResult(data));
}
-
-}
+}
--
Gitblit v1.8.0