From 25295657ad6d1675462f0b6814366417bbda6d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 13 六月 2019 17:35:47 +0800
Subject: [PATCH] 通用模板9块9添加

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index c545e78..ae2ac68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1999,7 +1999,9 @@
 		String hongBao = null;
 
 		// 鑾峰彇鍒镐俊鎭�
-		if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
+		if (!StringUtil.isNullOrEmpty(tb.getCouponInfo()) && tb.getCouponAmount() != null
+				&& tb.getCouponAmount().compareTo(new BigDecimal(0)) > 0 && tb.getCouponEffectiveStartTime() != null
+				&& tb.getCouponEffectiveEndTime() != null) {
 			BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
 			JSONObject couponInfo = new JSONObject();
 			couponInfo.put("couponPrice", MoneyBigDecimalUtil.getWithNoZera(quanPrice).toString());

--
Gitblit v1.8.0