From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 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 64913fc..f2c51a2 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
@@ -241,10 +241,10 @@
HttpServletRequest request, PrintWriter out) {
UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);
UserInfoExtra userExtraInfo = userInfoExtraService.getUserInfoExtra(uid);
- String inviteCode=null;
- if(userExtraInfo!=null)
- inviteCode=userExtraInfo.getInviteCode();
-
+ String inviteCode = null;
+ if (userExtraInfo != null)
+ inviteCode = userExtraInfo.getInviteCode();
+
String relationId = null;
if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null
&& extraInfo.getRelationValid() == true)
@@ -263,12 +263,8 @@
try {
ShareInfoVO shareInfo = new ShareInfoVO();
-
-
-
+
// 娴嬭瘯
-
-
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);
@@ -285,27 +281,26 @@
shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
shareInfo.setRule(configService.get("share_single_goods_rule"));
shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
-
- String commentTextStr= configService.get("share_single_goods_comment_text");
+
+ String commentTextStr = configService.get("share_single_goods_comment_text");
List<String> commentTexts = new ArrayList<>();
- if(!StringUtil.isNullOrEmpty(commentTextStr))
- {
- JSONArray array= JSONArray.fromObject(commentTextStr);
- for(int i=0;i<array.size();i++)
- {
- if(StringUtil.isNullOrEmpty(inviteCode))
- {
- if(array.optString(i).contains("[閭�璇风爜]"))
- {
+ if (!StringUtil.isNullOrEmpty(commentTextStr)) {
+ JSONArray array = JSONArray.fromObject(commentTextStr);
+ for (int i = 0; i < array.size(); i++) {
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ if (array.optString(i).contains("[閭�璇风爜]")) {
continue;
}
}
- commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK).replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", shareInfo.getToken()));
+ if (StringUtil.isNullOrEmpty(inviteCode))
+ commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[娣樺彛浠", shareInfo.getToken()));
+ else
+ commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", shareInfo.getToken()));
}
}
shareInfo.setCommentTexts(commentTexts);
-
-
String shareText = "";
// 鏃犲埜
@@ -617,7 +612,7 @@
// goodsId + "");
String couponUrl = null;
- JDCouponInfo couponInfo = jdGoods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
@@ -1020,7 +1015,7 @@
}
String couponUrl = null;
- JDCouponInfo couponInfo = goods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
--
Gitblit v1.8.0