From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 cbd7818..13d3b85 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
@@ -611,12 +611,18 @@
if (VersionUtil.greaterThan_2_0_7(platform, version)) {
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
String template = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
- recommendText = template.replace("[鍟嗗搧鏍囬]", goods.getTitle()).replace("[閿�閲廬",
- TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()));
+ recommendText = template.replace("[鍟嗗搧鏍囬]", goods.getTitle());
if (StringUtil.isNullOrEmpty(goods.getDescription())) {
- recommendText = recommendText.replace("鎺ㄨ崘璇�:[鎺ㄨ崘璇璢", "");
+ recommendText = recommendText.replace("鎺ㄨ崘鐞嗙敱:[鎺ㄨ崘璇璢", "");
} else {
- recommendText = recommendText.replace("[鎺ㄨ崘璇璢", goods.getDescription());
+ recommendText = recommendText.replace("[鎺ㄨ崘鐞嗙敱]", goods.getDescription());
+ }
+
+ String sales = TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day());
+ if (sales.equals("0")) {
+ recommendText = recommendText.replace("閿�閲�:[閿�閲廬", "");
+ } else {
+ recommendText = recommendText.replace("[閿�閲廬", sales.replace("涓�", "w"));
}
String quickCommentText = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
@@ -787,11 +793,17 @@
String recommendText = "";
if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
String template = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
- recommendText = template.replace("[鍟嗗搧鏍囬]", jdGoods.getSkuName()).replace("[閿�閲廬",
- JDUtil.getSaleCount(jdGoods.getInOrderCount30Days()));
+ recommendText = template.replace("[鍟嗗搧鏍囬]", jdGoods.getSkuName());
// 鏃犳帹鑽愯
- recommendText = recommendText.replace("鎺ㄨ崘璇�:[鎺ㄨ崘璇璢", "");
+ recommendText = recommendText.replace("鎺ㄨ崘鐞嗙敱:[鎺ㄨ崘璇璢", "");
+ String sales = JDUtil.getSaleCount(jdGoods.getInOrderCount30Days());
+ if (sales.equals("0")) {
+ recommendText = recommendText.replace("閿�閲�:[閿�閲廬", "");
+ } else {
+ recommendText = recommendText.replace("[閿�閲廬", sales.replace("涓�", "w"));
+ }
+
String quickCommentText = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
commentText = quickCommentText.replace("[鍘熶环]", jdGoods.getPrice().toString());
commentText = commentText.replace("[閾炬帴]", jumpLink);
@@ -968,8 +980,13 @@
if (StringUtil.isNullOrEmpty(salesTip)) {
salesTip = "0";
}
- recommendText = recommendText.replace("[閿�閲廬", salesTip);
- recommendText = recommendText.replace("鎺ㄨ崘璇�:[鎺ㄨ崘璇璢", "");
+ if (salesTip.equals("0")) {
+ recommendText = recommendText.replace("閿�閲�:[閿�閲廬", "");
+ } else {
+ recommendText = recommendText.replace("[閿�閲廬", salesTip.replace("涓�", "w"));
+ recommendText = recommendText.replace("閿�閲�", "鎬婚攢閲�");
+ }
+ recommendText = recommendText.replace("鎺ㄨ崘鐞嗙敱:[鎺ㄨ崘璇璢", "");
String quickCommentText = configService.get(ConfigKeyEnum.quickSharePDDCommentText.getKey());
commentText = quickCommentText.replace("[鍘熶环]", MoneyBigDecimalUtil
--
Gitblit v1.8.0