From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 10:46:32 +0800
Subject: [PATCH] 订单商品类型处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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..e2131cf 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,7 +71,6 @@
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;
@@ -533,18 +532,12 @@
* @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 + "");
@@ -555,10 +548,11 @@
url = shortLink;
}
+ ShareInfoVO shareInfo = new ShareInfoVO();
shareInfo.setClickUrl(url);
shareInfo.setRule(configService.get("share_rule_link_jd"));
shareInfo.setPictUrl(jdGoods.getPicUrl());
-
+
String shareText = "";
boolean hasCoupon = false;
// 鍒嗕韩妯℃澘
@@ -649,13 +643,11 @@
* @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;
}
-
- 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),
@@ -665,7 +657,8 @@
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
-
+
+ ShareInfoVO shareInfo = new ShareInfoVO();
shareInfo.setClickUrl(url);
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
@@ -792,12 +785,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 +939,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