From dc4c353aa5620e5624256be01cf967f82a980c18 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 16:33:14 +0800
Subject: [PATCH] 创建分享兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 83 ++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 47 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 89f7afa..43aa9b0 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
@@ -560,32 +560,25 @@
shareInfo.setPictUrl(jdGoods.getPicUrl());
String shareText = "";
- String shopType = "浜笢浠�";
-
+ boolean hasCoupon = false;
// 鍒嗕韩妯℃澘
JDCouponInfo couponInfo = jdGoods.getCouponInfo();
- if (couponInfo == null) {
- String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text)) {
- text = configService.get("goods_share_text_nocoupon");
- }
- shareText = text.replace("{鏍囬}", jdGoods.getSkuName()).replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(jdGoods.getPrice()) + "");
- } else// 鏈夊埜
- {
- String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
-
- shareText = text.replace("{鏍囬}", jdGoods.getSkuName())
- .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(jdGoods.getPrice()) + "")
- .replace("{浼樻儬鍒搁潰棰潁", MoneyBigDecimalUtil.getWithNoZera(couponInfo.getDiscount()) + "")
- .replace("{浼樻儬鍒镐环}", JDUtil.getQuanPrice(jdGoods) + "");
+ ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
+ if (couponInfo == null) { // 鏃犲埜妯℃澘
+ if (textTemplate != null)
+ shareText = textTemplate.getShareJDTextTemplate();
+
+ if (StringUtil.isNullOrEmpty(shareText))
+ shareText = configService.get("goods_share_text_nocoupon_jd");
+ } else { // 鏈夊埜妯℃澘
+ hasCoupon = true;
+ if (textTemplate != null)
+ shareText = textTemplate.getShareJDTextTemplateCoupon();
+
+ if (StringUtil.isNullOrEmpty(shareText))
+ shareText = configService.get("goods_share_text_coupon_jd");
}
-
- shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days())).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", null);
+ shareText = shareGoodsTextTemplateService.createContentByTemplateJD(shareText, uid, jdGoods, shortLink, hasCoupon);
shareInfo.setShareText(shareText);
String descText = shareText.replace(jdGoods.getSkuName(), "").trim();
@@ -594,7 +587,6 @@
}
shareInfo.setDescText(descText);
- //
String imgs = configService.get("goods_share_notify_imgs");
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
@@ -678,33 +670,30 @@
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
- String shareText = "";
- String shopType = "鎷煎澶氫环";
-
- // 鏃犲埜
+ String template = "";
+ boolean hasCoupon = false;
+ ShareGoodsTextTemplate textTemplate = shareGoodsTextTemplateService.getShareGoodsTextTemplate(uid);
if (goods.getHasCoupon() == null || !goods.getHasCoupon()) {
- String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
- shareText = text.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "");
- } else// 鏈夊埜
- {
- String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
- if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
+ if (textTemplate != null)
+ template = textTemplate.getSharePDDTextTemplate();
- shareText = text.replace("{鏍囬}", goods.getGoodsName())
- .replace("{鍟嗗搧鍘熶环}",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "")
- .replace("{浼樻儬鍒搁潰棰潁",
- MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCouponDiscount())) + "")
- .replace("{浼樻儬鍒镐环}", PinDuoDuoUtil.getQuanPrice(goods) + "");
+ if (StringUtil.isNullOrEmpty(template))
+ template = configService.get("goods_share_text_nocoupon_pdd");
+ } else {
+ hasCoupon = true;
+ if (textTemplate != null)
+ template = textTemplate.getSharePDDTextTemplateCoupon();
+
+ if (StringUtil.isNullOrEmpty(template))
+ template = configService.get("goods_share_text_coupon_pdd");
}
- shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
- .replace("{鏈堥攢閲弣", goods.getSalesTip()).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", null);
+ // 鍒涘缓鍙ｄ护
+ String token = PinDuoDuoApiUtil.createGenerate(goodsId);
+
+ // 鐢熸垚鍒嗕韩鍐呭
+ String shareText = shareGoodsTextTemplateService.createContentByTemplatePDD(template, uid, goods, shortLink,
+ hasCoupon, token);
shareInfo.setShareText(shareText);
String descText = shareText.replace(goods.getGoodsName(), "").trim();
--
Gitblit v1.8.0