From 19bf27d4ab468cfae8733ccb11850ebc6e5d1a62 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 12 三月 2020 11:18:14 +0800
Subject: [PATCH] 创建分享返回结果修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 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 0a92bff..89ad2ca 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
@@ -177,7 +177,7 @@
"涓嬭浇閾炬帴锛�" + Constant.YINGYONGBAO_LINK, false, true));
list.add(new ShareGoodsCommentChoiceInfo(ShareGoodsCommentChoiceInfo.TYPE_FANLI_MONEY, "杩斿埄閲戦",
- "杩斿埄閲戦锛毬� " + fanliMoney, false, true));
+ String.format("銆愯仈绯绘垜涓嬭浇APP銆戞渶楂樺彲杩旇繕%s鍏�", fanliMoney + ""), false, true));
return list;
}
@@ -244,8 +244,6 @@
}
}
-
-
public static String getERCodeContentNew(String template, TaoBaoGoodsBrief goods, String token) {
String commentText = template.replace("[鍘熶环]", goods.getZkPrice().toString());
commentText = commentText.replace("[娣樺彛浠", token);
@@ -255,11 +253,11 @@
} else {
commentText = commentText.replace("[鍒稿悗浠穄", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
}
-
- commentText =commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+
+ commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
return commentText;
}
-
+
/**
* 鍒涘缓娣樺疂鍒嗕韩淇℃伅
*
@@ -534,41 +532,45 @@
shareInfo.setCommentTexts(commentTexts);
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
-
+
boolean coupon = false;
if (!StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
coupon = true;
}
-
+
String template = shareGoodsTextTemplateService.getTextTemplateByTB(uid);
- String shareText = shareGoodsTextTemplateService.createContentTB(template, goods, taoBaoLink.getTaoToken(), coupon);
+ String shareText = shareGoodsTextTemplateService.createContentTB(template, goods, taoBaoLink.getTaoToken(),
+ coupon);
shareInfo.setShareText(shareText);
-
+
String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
if (descText.startsWith("\\r\\n")) {
descText = descText.substring(0);
}
shareInfo.setDescText(deleteBlankLine(descText));
-
+
// 娴嬭瘯
// 2.0.2涔嬪墠
if (VersionUtil.greaterThan_2_0_7(platform, version)) {
- shareInfo.setClickUrl(getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
- taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setClickUrl(
+ getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
} else if (!VersionUtil.greaterThan_2_0_2(platform, version)) {
- shareInfo.setClickUrl(getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
- taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setClickUrl(
+ getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
}
if (VersionUtil.greaterThan_2_0_7(platform, version)) {
- shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
- taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setWxErCode(
+ getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
} else {
- shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
- taoBaoLink.getGoods(), shareInfo.getToken()));
+ shareInfo.setWxErCode(
+ getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
+ taoBaoLink.getGoods(), shareInfo.getToken()));
}
-
-
+
// 鎻愮ず鍥炬枃鍐呭
String imgs = configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), platform,
Integer.parseInt(version));
@@ -600,7 +602,7 @@
e1.printStackTrace();
}
}
-
+
String commentText = "";
String recommendText = "";
if (VersionUtil.greaterThan_2_0_7(platform, version)) {
@@ -611,7 +613,7 @@
} else {
recommendText = recommendText.replace("[鎺ㄨ崘璇璢", goods.getDescription());
}
-
+
String sales = TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day());
if (sales.equals("0")) {
recommendText = recommendText.replace("閿�閲�:[閿�閲廬", "");
@@ -629,8 +631,7 @@
commentText = commentText.replace("[鍒稿悗浠穄",
TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
}
-
-
+
if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
recommendText = recommendText.replace("浼樻儬鍒�:[鍒搁潰棰漖鍏�", "");
} else {
@@ -646,7 +647,7 @@
// 璁剧疆璇勮鏂囨湰閫夐」
shareInfo.setCommentTextChoiceList(getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode,
- TaoBaoUtil.getGoodsHongBaoMoney(taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate())));
+ TaoBaoUtil.getGoodsHongBaoMoney(taoBaoLink.getGoods(), hongBaoManageService.getVIPFanLiRate())));
out.print(JsonUtil.loadTrueResult(
JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
@@ -732,7 +733,7 @@
if (couponInfo != null) {
hasCoupon = true;
}
-
+
String template = shareGoodsTextTemplateService.getTextTemplateByJD(uid);
String shareText = shareGoodsTextTemplateService.createContentJD(template, jdGoods, jumpLink, hasCoupon);
shareInfo.setShareText(shareText);
@@ -786,13 +787,13 @@
} else {
recommendText = recommendText.replace("[閿�閲廬", sales.replace("涓�", "w"));
}
-
+
BigDecimal price = jdGoods.getPrice();
JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();
if (pinGouInfo != null) {
price = pinGouInfo.getPingouPrice();
}
-
+
String template3 = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
commentText = template3.replace("[鍘熶环]", BigDecimalUtil.getWithNoZera(price).toString());
if (!hasCoupon) {
@@ -800,8 +801,10 @@
commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
} else {
- recommendText = recommendText.replace("[鍒搁潰棰漖", BigDecimalUtil.getWithNoZera(couponInfo.getDiscount()).toString());
- commentText = commentText.replace("[鍒稿悗浠穄", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(jdGoods)).toString());
+ recommendText = recommendText.replace("[鍒搁潰棰漖",
+ BigDecimalUtil.getWithNoZera(couponInfo.getDiscount()).toString());
+ commentText = commentText.replace("[鍒稿悗浠穄",
+ BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(jdGoods)).toString());
}
commentText = commentText.replace("[閾炬帴]", jumpLink);
} else {
@@ -813,7 +816,7 @@
// 璁剧疆璇勮鏂囨湰閫夐」
shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getCommentText(), inviteCode,
- JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getFanLiRate())));
+ JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPFanLiRate())));
out.print(JsonUtil.loadTrueResult(
JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
@@ -845,12 +848,10 @@
}
});
}
-
-
- private String deleteBlankLine(String st){
+
+ private String deleteBlankLine(String st) {
return st.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
}
-
/**
* 鎷煎澶氬垎浜�
@@ -892,12 +893,12 @@
}
// 鍒涘缓鍙ｄ护
-// String token = PinDuoDuoApiUtil.createGenerate(goodsId);
-
+ // String token = PinDuoDuoApiUtil.createGenerate(goodsId);
+
boolean hasCoupon = true;
if (goods.getHasCoupon() == null || !goods.getHasCoupon()) {
hasCoupon = false;
- }
+ }
String template = shareGoodsTextTemplateService.getTextTemplateByPDD(uid);
String shareText = shareGoodsTextTemplateService.createContentPDD(template, goods, jumpLink, hasCoupon);
shareInfo.setShareText(shareText);
@@ -984,8 +985,8 @@
shareInfo.setCommentText(deleteBlankLine(commentText));
// 璁剧疆璇勮鏂囨湰閫夐」
- shareInfo.setCommentTextChoiceList(getCommentChoiceList(null,shareInfo.getCommentText(), inviteCode,
- PinDuoDuoUtil.getGoodsFanLiMoney(goods, hongBaoManageService.getFanLiRate())));
+ shareInfo.setCommentTextChoiceList(getCommentChoiceList(null, shareInfo.getCommentText(), inviteCode,
+ PinDuoDuoUtil.getGoodsFanLiMoney(goods, hongBaoManageService.getVIPFanLiRate())));
out.print(JsonUtil.loadTrueResult(
JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
@@ -1101,7 +1102,7 @@
out.print(JsonUtil.loadFalseResult(5, e.getMsg()));
return;
}
-
+
// 鏌ヨ鏄惁鏈夊垎浜�
UserShareGoodsHistory userShareHistory = shareGoodsService.getShareGoodsHistory(uid, goods.getAuctionId());
String token = "";
@@ -1121,7 +1122,7 @@
StringUtil.isNullOrEmpty(goodsLink.getCouponLink()) ? goodsLink.getAuctionUrl()
: goodsLink.getCouponLink());
}
- String content = shareGoodsTextTemplateService.createContentTB(template, goods, token, hasCoupon);
+ String content = shareGoodsTextTemplateService.createContentTB(template, goods, token, hasCoupon);
JSONObject data = new JSONObject();
data.put("content", content);
out.print(JsonUtil.loadTrueResult(data));
@@ -1214,8 +1215,8 @@
String shortLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", uid + "");
-// // 鍒涘缓鍙ｄ护
-// String token = PinDuoDuoApiUtil.createGenerate(goodsId);
+ // // 鍒涘缓鍙ｄ护
+ // String token = PinDuoDuoApiUtil.createGenerate(goodsId);
// 鐢熸垚鍒嗕韩鍐呭
String content = shareGoodsTextTemplateService.createContentPDD(template, goods, shortLink, hasCoupon);
--
Gitblit v1.8.0