From c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:15:08 +0800
Subject: [PATCH] redis关键词
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index 598a407..a67b51e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -213,7 +213,7 @@
data.put("quanPrice", afterCouponPrice);
data.put("zkPrice", goods.getZkPrice());
data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
- data.put("token", link.getTaoToken());
+ data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));
data.put("reservePrice", goods.getReservePrice());
data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
@@ -243,6 +243,9 @@
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
public void getGoodsDetail(final AcceptData acceptData, final String id, String tid, String uid, String callback,
PrintWriter out) {
+ if (!StringUtil.isNullOrEmpty(uid))
+ uid = uid.replace(" ", "+");
+
LogHelper.shareGoods("鍒嗕韩鍑哄幓鐨凥5璁块棶: uid:" + uid + " id:" + id);
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
@@ -372,7 +375,7 @@
data.put("quanPrice", afterCouponPrice);
data.put("zkPrice", goods.getZkPrice());
data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
- data.put("token", link.getTaoToken());
+ data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));
data.put("reservePrice", goods.getReservePrice());
data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
@@ -446,7 +449,7 @@
boolean hasCoupon = false;
String couponUrl = null;
BigDecimal discount = new BigDecimal(0);
- JDCouponInfo couponInfo = jdGoods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo( jdGoods) ;
if (couponInfo != null) {
hasCoupon = true;
discount = couponInfo.getDiscount();
@@ -460,7 +463,7 @@
}
String materialId = "https://item.jd.com/" + id + ".html";
- String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
int priceType = 1;
BigDecimal price = jdGoods.getPrice();
--
Gitblit v1.8.0