From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 132 +++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 57 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 a4a67f0..75e5d1b 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
@@ -14,7 +14,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.entity.FileUploadResult;
@@ -42,11 +41,14 @@
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoLink;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
+import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
@@ -56,7 +58,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
-import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -121,7 +122,7 @@
@Resource
private QrCodeService qrCodeService;
-
+
@Resource
private ConvertLinkManager convertLinkManager;
@@ -589,7 +590,7 @@
@RequestMapping(value = "getDynamicList", method = RequestMethod.POST)
public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, PrintWriter out) {
int type = 1;
- if (cid == TYPE_FAQUAN){
+ if (cid == TYPE_FAQUAN) {
type = 1;
} else if (cid == TYPE_SUCAI) {
type = 2;
@@ -751,46 +752,8 @@
}
List<String> list = new ArrayList<>();
- // 鍗曞搧
- if (goodsEvaluate.getType() == EvaluateEnum.single) {
- for (ImgInfo imgInfo : imgs) {
- GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
- if (goodsVO == null) {
- list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
- continue;
- }
-
- String jumpLink = getJumpLink(goodsVO, user, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- }
-
- } else if (goodsEvaluate.getType() == EvaluateEnum.multiple) {
- if (type == 1) {
- for (ImgInfo imgInfo : imgs) {
- if (imgInfo.getGoodsVO() != null)
- if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
- && imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- break;
- }
- }
- } else if (type == 2 || type == 3) {
- for (ImgInfo imgInfo : imgs) {
- if (imgInfo.getGoodsVO() != null) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- }
- }
- }
-
- } else if (goodsEvaluate.getType() == EvaluateEnum.activity) {
+ Integer dynamicType = goodsEvaluate.getDynamicType();
+ if (dynamicType == null || dynamicType.intValue() == 2) {
for (ImgInfo imgInfo : imgs) {
if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
continue;
@@ -800,6 +763,58 @@
if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
list.add(imgInfo.getActivityPic());
}
+ }
+ } else {
+ // 鍗曞搧
+ if (goodsEvaluate.getType() == EvaluateEnum.single) {
+ for (ImgInfo imgInfo : imgs) {
+ GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
+ if (goodsVO == null) {
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
+ continue;
+ }
+
+ String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode);
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ }
+
+ } else if (goodsEvaluate.getType() == EvaluateEnum.multiple) {
+ if (type == 1) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getGoodsVO() != null)
+ if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
+ && imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ break;
+ }
+ }
+ } else if (type == 2 || type == 3) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getGoodsVO() != null) {
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ }
+ }
+ }
+
+ } else if (goodsEvaluate.getType() == EvaluateEnum.activity) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
+ continue;
+ if (imgInfo.getType() == ImgEnum.img)
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
+ else if (imgInfo.getType() == ImgEnum.activity)
+ if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
+ list.add(imgInfo.getActivityPic());
+ }
+ }
}
}
@@ -824,17 +839,21 @@
out.print(JsonUtil.loadTrueResult(data));
}
- private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String inviteCode) {
+ @Resource
+ private ShareGoodsService shareGoodsService;
+
+ private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode) {
String jumpLink = null;
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
- Constant.systemCommonConfig.getShareGoodsPagePath(),
- AESUtil.encrypt(user.getId() + "", Constant.UIDAESKEY), goodsVO.getGoodsId() + "");
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
+ TaoBaoLink taoBaoLink = null;
+ try {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(user.getId(), goodsVO.getGoodsId(), relationId);
+ } catch (ShareGoodsException e) {
+ e.printStackTrace();
}
- jumpLink = url;
+
+ 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) {
@@ -915,12 +934,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;
}
@@ -928,6 +947,5 @@
data.put("text", text);
out.print(JsonUtil.loadTrueResult(data));
}
-
-}
+}
--
Gitblit v1.8.0