From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 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..d13741f 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))
@@ -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))
@@ -336,29 +338,45 @@
 	
 	@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);
 		} 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());
+					.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(amount).toString())
+					.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString());
 		}
 		
 		if (StringUtil.isNullOrEmpty(token)) {

--
Gitblit v1.8.0