From a34d378f8529d3e7ebe96d656349da26fdc0dbbb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:42:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 3904133..bf369b4 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
@@ -905,12 +905,12 @@
BigDecimal amount = new BigDecimal(goods.getCouponInfo().getCouponValue());
BigDecimal startFee = new BigDecimal(goods.getCouponInfo().getBounsLimit());
BigDecimal zkPrice = new BigDecimal(commodityPrice);
- BigDecimal couponPrice = zkPrice;
if (zkPrice.compareTo(startFee) >= 0) {
- couponPrice = zkPrice.subtract(amount);
+ BigDecimal couponPrice = zkPrice.subtract(amount);
commentText = commentText.replace("[鍒稿悗浠穄",BigDecimalUtil.getWithNoZera(couponPrice).toString());
} else {
- commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+ commentText = commentText.replace("[鍒稿悗浠穄", BigDecimalUtil.getWithNoZera(new BigDecimal(commodityPrice)).toString());
+
}
} else {
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
--
Gitblit v1.8.0