From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java | 133 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 66 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 07e4758..7d8e6da 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
@@ -40,12 +40,10 @@
@Resource
private ConfigService configService;
-
+
@Resource
private ConfigTaoLiJinService configTaoLiJinService;
-
-
-
+
@Override
public void saveCommonTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {
isCommonTemplateRight(template);
@@ -64,7 +62,7 @@
shareGoodsTextTemplateMapper.insertSelective(textTemplate);
}
}
-
+
@Override
public void saveCommonTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException {
isCommonTemplateRight(template);
@@ -83,7 +81,7 @@
shareGoodsTextTemplateMapper.insertSelective(textTemplate);
}
}
-
+
@Override
public void saveCommonTemplatePDD(Long uid, String template) throws ShareGoodsTextTemplateException {
isCommonTemplateRight(template);
@@ -116,7 +114,7 @@
public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
isTaoLiJinTemplateRight(template);
-
+
ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid);
if (old != null) {
ShareGoodsTextTemplate update = new ShareGoodsTextTemplate();
@@ -132,13 +130,13 @@
shareGoodsTextTemplateMapper.insertSelective(textTemplate);
}
}
-
+
@Transactional
@Override
public void saveCouponTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
isTaoLiJinTemplateRight(template);
-
+
ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid);
if (old != null) {
ShareGoodsTextTemplate update = new ShareGoodsTextTemplate();
@@ -154,14 +152,13 @@
shareGoodsTextTemplateMapper.insertSelective(textTemplate);
}
}
-
-
+
@Transactional
@Override
public void saveCouponTemplatePDD(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
isTaoLiJinTemplateRight(template);
-
+
ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid);
if (old != null) {
ShareGoodsTextTemplate update = new ShareGoodsTextTemplate();
@@ -178,13 +175,12 @@
}
}
-
@Transactional
@Override
public void saveTaoLiJinTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {
-
+
isCouponTemplateRight(template);
-
+
ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid);
if (old != null) {
ShareGoodsTextTemplate update = new ShareGoodsTextTemplate();
@@ -201,7 +197,7 @@
}
}
-
+
@Override
public String geteCouponTemplate(Long uid) {
ShareGoodsTextTemplate template = shareGoodsTextTemplateMapper.selectByUid(uid);
@@ -210,7 +206,6 @@
return null;
}
-
@Override
public String getTaoLiJinTemplate(Long uid) {
ShareGoodsTextTemplate template = shareGoodsTextTemplateMapper.selectByUid(uid);
@@ -218,12 +213,12 @@
return template.getShareTaoLiJinTextTemplate();
return null;
}
-
+
@Override
public ShareGoodsTextTemplate getShareGoodsTextTemplate(Long uid) {
return shareGoodsTextTemplateMapper.selectByUid(uid);
}
-
+
@Override
public void isCommonTemplateRight(String template) throws ShareGoodsTextTemplateException {
String[] keys = new String[] { "{鏍囬}", "{搴楅摵绫诲瀷}", "{鍟嗗搧鍘熶环}", "{鏈堥攢閲弣", "{鐭摼}", "{娣樺彛浠" };
@@ -237,7 +232,7 @@
@Override
public void isCommonTemplateRightJD(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))
@@ -245,10 +240,10 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
+
@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))
@@ -256,7 +251,7 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
+
@Override
public void isCouponTemplateRight(String template) throws ShareGoodsTextTemplateException {
String[] keys = new String[] { "{鏍囬}", "{搴楅摵绫诲瀷}", "{鍟嗗搧鍘熶环}", "{浼樻儬鍒搁潰棰潁", "{浼樻儬鍒镐环}", "{鏈堥攢閲弣", "{棰嗗埜鐭摼}", "{娣樺彛浠" };
@@ -267,11 +262,10 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
-
+
@Override
public void isCouponTemplateRightJD(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))
@@ -280,10 +274,9 @@
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
@Override
public void isCouponTemplateRightPDD(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))
@@ -292,10 +285,10 @@
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
@Override
public void isTaoLiJinTemplateRight(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))
@@ -303,57 +296,66 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
-
+
@Override
public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods, String token,
String shortLink, boolean hasCoupon, Long tljId) {
-
+
if (tljId != null) {
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
-
- return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera( goods.getZkPrice()).toString())
+
+ return template.replace("{鏍囬}", goods.getTitle())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", token).replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
- .replace("{娣樼ぜ閲戦潰棰潁", BigDecimalUtil.getWithNoZera(spreadMoney).toString()).replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera( TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
+ .replace("{娣樺彛浠", token)
+ .replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
+ .replace("{娣樼ぜ閲戦潰棰潁", BigDecimalUtil.getWithNoZera(spreadMoney).toString())
+ .replace("{浼樻儬鍒镐环}",
+ BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
.replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? "澶╃尗浠�" : "娣樺疂浠�");
- }
-
+ }
+
if (!hasCoupon) {
- return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
+ return template.replace("{鏍囬}", goods.getTitle())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
.replace("{娣樺彛浠", token).replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? "澶╃尗浠�"
: "娣樺疂浠�");
} else {
- return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera( goods.getZkPrice()).toString())
+ return template.replace("{鏍囬}", goods.getTitle())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
- .replace("{娣樺彛浠", token).replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
- .replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera( TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
+ .replace("{娣樺彛浠", token)
+ .replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
+ .replace("{浼樻儬鍒镐环}",
+ BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
.replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? "澶╃尗浠�" : "娣樺疂浠�");
}
}
-
-
+
@Override
- public String createContentByTemplateJD(String template, Long uid, JDGoods goods, String shortLink, boolean hasCoupon) {
+ public String createContentByTemplateJD(String template, Long uid, JDGoods goods, String shortLink,
+ boolean hasCoupon) {
BigDecimal price = goods.getPrice();
JDPingouInfo pinGouInfo = goods.getPinGouInfo();
if (pinGouInfo != null) {
price = pinGouInfo.getPingouPrice();
}
-
+
if (!hasCoupon) {
- template = template.replace("{鏍囬}", goods.getSkuName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
+ template = template.replace("{鏍囬}", goods.getSkuName())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{鐭摼鎺", shortLink);
} else {
- template = template.replace("{鏍囬}", goods.getSkuName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
+ template = template.replace("{鏍囬}", goods.getSkuName())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{鐭摼鎺", shortLink)
.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponInfo().getDiscount()).toString())
.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(goods)).toString());
}
-
+
if (pinGouInfo != null) {
template = template.replace("{浜笢浠穧", "鎷艰喘浠�");
} else {
@@ -361,15 +363,15 @@
}
return template;
}
-
-
+
@Override
- public String createContentByTemplatePDD(String template, Long uid, PDDGoodsDetail goods,
- String shortLink, boolean hasCoupon, String token) {
+ public String createContentByTemplatePDD(String template, Long uid, PDDGoodsDetail goods, String shortLink,
+ boolean hasCoupon, String token) {
BigDecimal hundred = new BigDecimal(100);
- BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred);
+ BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred);
if (!hasCoupon) {
- template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
+ template = template.replace("{鏍囬}", goods.getGoodsName())
+ .replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鎬婚攢閲弣", goods.getSalesTip()).replace("{鐭摼鎺", shortLink);
if (StringUtil.isNullOrEmpty(token)) {
template = template.replace("澶嶅埗鏈潯淇℃伅锛寋澶氬鍙ｄ护}鎵撳紑鎷煎澶氾紝绔嬪嵆璐拱", "鐐瑰嚮閾炬帴锛屾墦寮�鎷煎澶氾紝绔嬪嵆璐拱");
@@ -377,19 +379,20 @@
template = template.replace("{澶氬鍙ｄ护}", token);
}
} else {
- BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred);
- template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
+ 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);
}
}
-
+
return template;
}
@@ -417,8 +420,7 @@
shareGoodsTextTemplateMapper.updateByPrimaryKeySelective(update);
}
}
-
-
+
@Override
public void resetCommonTemplateJD(Long uid) {
ShareGoodsTextTemplate template = shareGoodsTextTemplateMapper.selectByUid(uid);
@@ -443,8 +445,7 @@
shareGoodsTextTemplateMapper.updateByPrimaryKeySelective(update);
}
}
-
-
+
@Override
public void resetCommonTemplatePDD(Long uid) {
ShareGoodsTextTemplate template = shareGoodsTextTemplateMapper.selectByUid(uid);
@@ -481,5 +482,5 @@
shareGoodsTextTemplateMapper.updateByPrimaryKeySelective(update);
}
}
-
+
}
--
Gitblit v1.8.0