From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 42 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 e7cfea4..abd1c49 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
@@ -12,6 +12,7 @@
import com.yeshi.fanli.dao.mybatis.goods.ShareGoodsTextTemplateMapper;
import com.yeshi.fanli.dto.jd.JDPingouInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.goods.ShareGoodsTextTemplate;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
@@ -111,7 +112,7 @@
return null;
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
@@ -133,7 +134,7 @@
}
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void saveCouponTemplateJD(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
@@ -155,7 +156,7 @@
}
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void saveCouponTemplatePDD(Long uid, String template) throws ShareGoodsTextTemplateException {
// 鏍煎紡楠岃瘉
@@ -177,7 +178,7 @@
}
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void saveTaoLiJinTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {
@@ -227,51 +228,68 @@
ShareGoodsTextTemplate objct = shareGoodsTextTemplateMapper.selectByUid(uid);
if (objct != null && !StringUtil.isNullOrEmpty(objct.getShareTextTemplate())) {
template = objct.getShareTextTemplate();
- if (template.contains("{鍟嗗搧鍘熶环}")|| template.contains("{浼樻儬鍒搁潰棰潁") ||
- template.contains("{浼樻儬鍒镐环}")|| template.contains("{鏈堥攢閲弣")) {
+ if (template.contains("{鍟嗗搧鍘熶环}") || template.contains("{浼樻儬鍒搁潰棰潁") || template.contains("{浼樻儬鍒镐环}")
+ || template.contains("{鏈堥攢閲弣")) {
template = ""; // 鑰佹澘鍒嗕韩
}
- }
+ }
if (StringUtil.isNullOrEmpty(template)) {
template = configService.get(ConfigKeyEnum.shareCommentTextTB.getKey());
}
-
+
return template;
}
-
+
@Override
public String getTextTemplateByJD(Long uid) {
String template = "";
ShareGoodsTextTemplate objct = shareGoodsTextTemplateMapper.selectByUid(uid);
if (objct != null && !StringUtil.isNullOrEmpty(objct.getShareJDTextTemplate())) {
template = objct.getShareJDTextTemplate();
- if (template.contains("{鍟嗗搧鍘熶环}")|| template.contains("{鏈堥攢閲弣") || template.contains("{鐭摼鎺")) {
+ if (template.contains("{鍟嗗搧鍘熶环}") || template.contains("{鏈堥攢閲弣") || template.contains("{鐭摼鎺")) {
template = ""; // 鑰佹澘鍒嗕韩
}
- }
+ }
if (StringUtil.isNullOrEmpty(template)) {
template = configService.get(ConfigKeyEnum.shareCommentTextJD.getKey());
}
return template;
}
-
+
@Override
public String getTextTemplateByPDD(Long uid) {
String template = "";
ShareGoodsTextTemplate objct = shareGoodsTextTemplateMapper.selectByUid(uid);
if (objct != null && !StringUtil.isNullOrEmpty(objct.getSharePDDTextTemplate())) {
template = objct.getSharePDDTextTemplate();
- if (template.contains("{鍟嗗搧鍘熶环}")|| template.contains("{鎬婚攢閲弣") || template.contains("{鐭摼鎺")) {
+ if (template.contains("{鍟嗗搧鍘熶环}") || template.contains("{鎬婚攢閲弣") || template.contains("{鐭摼鎺")) {
template = ""; // 鑰佹澘鍒嗕韩
}
- }
+ }
if (StringUtil.isNullOrEmpty(template)) {
template = configService.get(ConfigKeyEnum.shareCommentTextPDD.getKey());
}
-
+
return template;
}
-
+
+ @Override
+ public String getTextTemplateByVIP(Long uid) {
+ String template = "";
+ ShareGoodsTextTemplate objct = shareGoodsTextTemplateMapper.selectByUid(uid);
+ if (objct != null && !StringUtil.isNullOrEmpty(objct.getSharePDDTextTemplate())) {
+ template = objct.getSharePDDTextTemplate();
+ if (template.contains("{鍟嗗搧鍘熶环}") || template.contains("{鎬婚攢閲弣") || template.contains("{鐭摼鎺")) {
+ template = ""; // 鑰佹澘鍒嗕韩
+ }
+ }
+ if (StringUtil.isNullOrEmpty(template)) {
+ template = configService.get(ConfigKeyEnum.shareCommentTextPDD.getKey());
+ }
+
+ return template;
+ }
+
@Override
public void saveTemplateTB(Long uid, String template) throws ShareGoodsTextTemplateException {
verifyRightTB(template);
@@ -328,12 +346,10 @@
shareGoodsTextTemplateMapper.insertSelective(textTemplate);
}
}
-
-
-
+
@Override
public void verifyRightTB(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))
@@ -341,10 +357,10 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
+
@Override
public void verifyRightJD(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))
@@ -352,11 +368,10 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
-
+
@Override
public void verifyRightPDD(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))
@@ -364,8 +379,7 @@
if (keysCount == 0)
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
-
-
+
@Override
public String createContentTB(String template, TaoBaoGoodsBrief goods, String token, boolean coupon) {
String commentText = template.replace("{鍘熶环}", goods.getZkPrice().toString());
@@ -374,12 +388,11 @@
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
commentText = commentText.replace("銆愬埜鍚庝环銆憑鍒稿悗浠穧鍏�", "");
} else {
- commentText = commentText.replace("{鍒稿悗浠穧",
- TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
+ commentText = commentText.replace("{鍒稿悗浠穧", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
}
return deleteBlankLine(commentText);
}
-
+
@Override
public String createContentJD(String template, JDGoods goods, String jumpLink, boolean coupon) {
String commentText = template.replace("{鍘熶环}", goods.getPrice().toString());
@@ -393,7 +406,7 @@
}
return deleteBlankLine(commentText);
}
-
+
@Override
public String createContentPDD(String template, PDDGoodsDetail goods, String jumpLink, boolean coupon) {
String commentText = template.replace("{鍘熶环}", MoneyBigDecimalUtil
@@ -408,9 +421,18 @@
}
return deleteBlankLine(commentText);
}
-
-
-
+
+ @Override
+ public String createContentVIP(String template, VIPGoodsInfo goods, String jumpLink) {
+ String commentText = template.replace("{鍘熶环}", goods.getMarketPrice());
+ commentText = commentText.replace("{閾炬帴}", jumpLink);
+
+ commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
+ commentText = commentText.replace("銆愬埜鍚庝环銆憑鍒稿悗浠穧鍏�", "");
+
+ return deleteBlankLine(commentText);
+ }
+
@Override
public void isCommonTemplateRight(String template) throws ShareGoodsTextTemplateException {
String[] keys = new String[] { "{鏍囬}", "{搴楅摵绫诲瀷}", "{鍟嗗搧鍘熶环}", "{鏈堥攢閲弣", "{鐭摼}", "{娣樺彛浠" };
@@ -489,12 +511,10 @@
throw new ShareGoodsTextTemplateException(1, "妯℃澘鏍煎紡鏈夎");
}
- 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");
}
-
-
-
+
@Override
public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods, String token,
String shortLink, boolean hasCoupon, Long tljId) {
@@ -512,7 +532,8 @@
.replace("{娣樼ぜ閲戦潰棰潁", BigDecimalUtil.getWithNoZera(spreadMoney).toString())
.replace("{浼樻儬鍒镐环}",
BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
- .replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO);
+ .replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM
+ : TaoBaoConstant.SHARE_PRICE_TAOBAO);
}
if (!hasCoupon) {
@@ -520,7 +541,7 @@
.replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{棰嗗埜鐭摼}", shortLink)
.replace("{娣樺彛浠", token).replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM
- : TaoBaoConstant.SHARE_PRICE_TAOBAO);
+ : TaoBaoConstant.SHARE_PRICE_TAOBAO);
} else {
return template.replace("{鏍囬}", goods.getTitle())
.replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
@@ -529,7 +550,8 @@
.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
.replace("{浼樻儬鍒镐环}",
BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
- .replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM : TaoBaoConstant.SHARE_PRICE_TAOBAO);
+ .replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM
+ : TaoBaoConstant.SHARE_PRICE_TAOBAO);
}
}
@@ -550,7 +572,8 @@
template = template.replace("{鏍囬}", goods.getSkuName())
.replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{鐭摼鎺", shortLink)
- .replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(JDUtil.getShowCouponInfo( goods).getDiscount()).toString())
+ .replace("{浼樻儬鍒搁潰棰潁",
+ BigDecimalUtil.getWithNoZera(JDUtil.getShowCouponInfo(goods).getDiscount()).toString())
.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(goods)).toString());
}
--
Gitblit v1.8.0