From 34e65d72e73acab040b68d01ef6b4764b4408624 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 10:07:38 +0800
Subject: [PATCH] 修改推荐记录点击详情跳转方式不对的bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 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 55b1fd4..07e4758 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
@@ -10,6 +10,7 @@
import org.yeshi.utils.BigDecimalUtil;
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.entity.goods.ShareGoodsTextTemplate;
import com.yeshi.fanli.entity.jd.JDGoods;
@@ -18,6 +19,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
@@ -235,7 +237,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))
@@ -246,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))
@@ -269,7 +271,7 @@
@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))
@@ -321,8 +323,8 @@
if (!hasCoupon) {
return template.replace("{鏍囬}", goods.getTitle()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getZkPrice()).toString())
- .replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{鐭摼}", shortLink)
- .replace("{娣樺彛浠", "").replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? "澶╃尗浠�"
+ .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())
@@ -336,35 +338,56 @@
@Override
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) {
- return template.replace("{鏍囬}", goods.getSkuName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(goods.getPrice()).toString())
+ template = template.replace("{鏍囬}", goods.getSkuName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{鐭摼鎺", shortLink);
} else {
- return template.replace("{鏍囬}", goods.getSkuName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera( goods.getPrice()).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 {
+ template = template.replace("{浜笢浠穧", "浜笢浠�");
+ }
+ return template;
}
@Override
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);
if (!hasCoupon) {
- template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())).toString())
+ 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 {
- template = template.replace("{鏍囬}", goods.getGoodsName()).replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())).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(new BigDecimal(goods.getCouponDiscount())).toString())
- .replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera( PinDuoDuoUtil.getQuanPrice(goods)).toString());
- }
-
- if (StringUtil.isNullOrEmpty(token)) {
- template = template.replace("{澶氬鍙ｄ护}鎵撳紑鎷煎澶氾紝", "");
- } else {
- template = template.replace("{澶氬鍙ｄ护}", token);
+ .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;
--
Gitblit v1.8.0