From 90b211c63f9d596aa90b508f76eb916a30b68731 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
index d13741f..148f80b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
@@ -248,7 +248,7 @@
@Override
public void isCommonTemplateRightPDD(String template) throws ShareGoodsTextTemplateException {
- String[] keys = new String[] { "{鏍囬}", "{鍟嗗搧鍘熶环}", "{鏈堥攢閲弣", "{鐭摼鎺", "{澶氬鍙ｄ护}" };
+ String[] keys = new String[] { "{鏍囬}", "{鍟嗗搧鍘熶环}", "{鏈堥攢閲弣", "{鐭摼鎺"};
int keysCount = 0;
for (String key : keys)
if (template != null && template.contains(key))
@@ -371,18 +371,23 @@
if (!hasCoupon) {
template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鎬婚攢閲弣", goods.getSalesTip()).replace("{鐭摼鎺", shortLink);
+ if (StringUtil.isNullOrEmpty(token)) {
+ template = template.replace("澶嶅埗鏈潯淇℃伅锛寋澶氬鍙ｄ护}鎵撳紑鎷煎澶�", "鐐瑰嚮閾炬帴锛屾墦寮�鎷煎澶�");
+ } else {
+ template = template.replace("{澶氬鍙ｄ护}", token);
+ }
} else {
BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred);
template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鎬婚攢閲弣", goods.getSalesTip()).replace("{鐭摼鎺", shortLink)
.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(amount).toString())
.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString());
- }
-
- if (StringUtil.isNullOrEmpty(token)) {
- template = template.replace("{澶氬鍙ｄ护}鎵撳紑鎷煎澶氾紝", "");
- } else {
- template = template.replace("{澶氬鍙ｄ护}", token);
+
+ if (StringUtil.isNullOrEmpty(token)) {
+ template = template.replace("{澶氬鍙ｄ护}", "");
+ } else {
+ template = template.replace("{澶氬鍙ｄ护}", token);
+ }
}
return template;
--
Gitblit v1.8.0