From ae2294be876ac4595d7b31b36c0057726d12354f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 五月 2021 16:11:16 +0800
Subject: [PATCH] 淘宝券后价计算方法名称修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java |   14 +++++++-------
 1 files changed, 7 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 0842e7b..fbb2708 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
@@ -478,7 +478,7 @@
 			commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
 			commentText = commentText.replace("銆愬埜鍚庝环銆憑鍒稿悗浠穧鍏�", "");
 		} else {
-			commentText = commentText.replace("{鍒稿悗浠穧", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
+			commentText = commentText.replace("{鍒稿悗浠穧", TaoBaoUtil.getCouponPrice(goods) + "");
 		}
 		return deleteBlankLine(commentText);
 	}
@@ -492,7 +492,7 @@
 			commentText = commentText.replace("銆愬埜鍚庝环銆憑鍒稿悗浠穧鍏�", "");
 		} else {
 			commentText = commentText.replace("{鍒稿悗浠穧",
-					BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(goods)).toString());
+					BigDecimalUtil.getWithNoZera(JDUtil.getCouponPrice(goods)).toString());
 		}
 		return deleteBlankLine(commentText);
 	}
@@ -507,7 +507,7 @@
 			commentText = commentText.replace("銆愬埜鍚庝环銆憑鍒稿悗浠穧鍏�", "");
 		} else {
 			commentText = commentText.replace("{鍒稿悗浠穧",
-					BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString());
+					BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getCouponPrice(goods)).toString());
 		}
 		return deleteBlankLine(commentText);
 	}
@@ -620,7 +620,7 @@
 					.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
 					.replace("{娣樼ぜ閲戦潰棰潁", BigDecimalUtil.getWithNoZera(spreadMoney).toString())
 					.replace("{浼樻儬鍒镐环}",
-							BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
+							BigDecimalUtil.getWithNoZera(TaoBaoUtil.getCouponPrice(goods)).toString())
 					.replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM
 							: TaoBaoConstant.SHARE_PRICE_TAOBAO);
 		}
@@ -638,7 +638,7 @@
 					.replace("{娣樺彛浠", token)
 					.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString())
 					.replace("{浼樻儬鍒镐环}",
-							BigDecimalUtil.getWithNoZera(TaoBaoUtil.getAfterUseCouplePrice(goods)).toString())
+							BigDecimalUtil.getWithNoZera(TaoBaoUtil.getCouponPrice(goods)).toString())
 					.replace("{搴楅摵绫诲瀷}", goods.getUserType() == 1 ? TaoBaoConstant.SHARE_PRICE_TM
 							: TaoBaoConstant.SHARE_PRICE_TAOBAO);
 		}
@@ -663,7 +663,7 @@
 					.replace("{鏈堥攢閲弣", JDUtil.getSaleCount(goods.getInOrderCount30Days())).replace("{鐭摼鎺", shortLink)
 					.replace("{浼樻儬鍒搁潰棰潁",
 							BigDecimalUtil.getWithNoZera(JDUtil.getShowCouponInfo(goods).getDiscount()).toString())
-					.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(goods)).toString());
+					.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(JDUtil.getCouponPrice(goods)).toString());
 		}
 
 		if (pinGouInfo != null) {
@@ -694,7 +694,7 @@
 					.replace("{鍟嗗搧鍘熶环}", BigDecimalUtil.getWithNoZera(price).toString())
 					.replace("{鎬婚攢閲弣", goods.getSalesTip()).replace("{鐭摼鎺", shortLink)
 					.replace("{浼樻儬鍒搁潰棰潁", BigDecimalUtil.getWithNoZera(amount).toString())
-					.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getQuanPrice(goods)).toString());
+					.replace("{浼樻儬鍒镐环}", BigDecimalUtil.getWithNoZera(PinDuoDuoUtil.getCouponPrice(goods)).toString());
 
 			if (StringUtil.isNullOrEmpty(token)) {
 				template = template.replace("澶嶅埗鏈潯淇℃伅锛寋澶氬鍙d护}鎵撳紑鎷煎澶氾紝鍏嶈垂棰嗗埜", "鐐瑰嚮閾炬帴锛屾墦寮�鎷煎澶氾紝鍏嶈垂棰嗗埜");

--
Gitblit v1.8.0