From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 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 43aa9b0..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
@@ -533,36 +533,34 @@
* @param out
*/
public void createJDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {
-
- JDGoods jdGoods = JDApiUtil.queryGoodsDetail(goodsId);
- if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(goodsId);
- }
-
+ JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
if (jdGoods == null) {
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佹窐宸蹭笅鏋�"));
return;
}
- ShareInfoVO shareInfo = new ShareInfoVO();
- 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+ "");
+
- shareInfo.setClickUrl(url);
+ ShareInfoVO shareInfo = new ShareInfoVO();
+ 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)
@@ -578,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,24 +647,20 @@
* @param out
*/
public void createPDDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {
- PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(goodsId);
+ PDDGoodsDetail goods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
if (goods == null) {
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
return;
}
+// String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+// Constant.systemCommonConfig.getShareGoodsPagePathPDD(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+// goodsId + "");
+
+ String jumpLink = PinDuoDuoApiUtil.convert(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");
+
ShareInfoVO shareInfo = new ShareInfoVO();
-
- 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;
- }
-
- shareInfo.setClickUrl(url);
+ shareInfo.setClickUrl(jumpLink);
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
@@ -692,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);
@@ -792,12 +786,12 @@
return;
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
createJDViewText(goodsType, uid, template, goodsId, hasCoupon, out);
return;
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (goodsType == Constant.SOURCE_TYPE_PDD) {
createPDDViewText(goodsType, uid, template, goodsId, hasCoupon, out);
return;
}
@@ -946,8 +940,8 @@
}
}
- String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
- Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
+ 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);
--
Gitblit v1.8.0