From 969ac5f2ef08e2cd662853d9b771c9663c5d2c70 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 14:52:49 +0800
Subject: [PATCH] 分享商品更改缓存简版商品
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 e2131cf..72e1ab3 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
@@ -71,6 +71,7 @@
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
@@ -538,25 +539,28 @@
return;
}
- String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
- Constant.systemCommonConfig.getShareGoodsPagePathJD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- goodsId + "");
+// String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+// Constant.systemCommonConfig.getShareGoodsPagePathJD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+// goodsId + "");
- // 鍒哥煭杩炴帴
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
+ String couponUrl = null;
+ JDCouponInfo couponInfo = jdGoods.getCouponInfo();
+ if (couponInfo != null) {
+ couponUrl = couponInfo.getLink();
}
+ String materialId = "https://item.jd.com/" + goodsId + ".html";
+ String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid+ "");
+
ShareInfoVO shareInfo = new ShareInfoVO();
- shareInfo.setClickUrl(url);
+ shareInfo.setClickUrl(jumpLink);
shareInfo.setRule(configService.get("share_rule_link_jd"));
shareInfo.setPictUrl(jdGoods.getPicUrl());
String shareText = "";
boolean hasCoupon = false;
+
// 鍒嗕韩妯℃澘
- JDCouponInfo couponInfo = jdGoods.getCouponInfo();
ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
if (couponInfo == null) { // 鏃犲埜妯℃澘
if (textTemplate != null)
@@ -572,7 +576,7 @@
if (StringUtil.isNullOrEmpty(shareText))
shareText = configService.get("goods_share_text_coupon_jd");
}
- shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, shortLink, hasCoupon);
+ shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, jumpLink, hasCoupon);
shareInfo.setShareText(shareText);
String descText = shareText.replace(jdGoods.getSkuName(), "").trim();
@@ -649,17 +653,14 @@
return;
}
- String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
- Constant.systemCommonConfig.getShareGoodsPagePathPDD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- goodsId + "");
+// String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+// Constant.systemCommonConfig.getShareGoodsPagePathPDD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+// goodsId + "");
- String shortLink = HttpUtil.getShortLink(url);
- if (!StringUtil.isNullOrEmpty(shortLink)) {
- url = shortLink;
- }
+ String jumpLink = PinDuoDuoApiUtil.convert(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");
ShareInfoVO shareInfo = new ShareInfoVO();
- shareInfo.setClickUrl(url);
+ shareInfo.setClickUrl(jumpLink);
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
@@ -685,7 +686,7 @@
String token = PinDuoDuoApiUtil.createGenerate(goodsId);
// 鐢熸垚鍒嗕韩鍐呭
- String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, shortLink,
+ String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, jumpLink,
hasCoupon, token);
shareInfo.setShareText(shareText);
--
Gitblit v1.8.0