From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 9ad8bfe..f2c51a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -612,7 +612,7 @@
 		// goodsId + "");
 
 		String couponUrl = null;
-		JDCouponInfo couponInfo = jdGoods.getCouponInfo();
+		JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);
 		if (couponInfo != null) {
 			couponUrl = couponInfo.getLink();
 		}
@@ -1015,7 +1015,7 @@
 		}
 
 		String couponUrl = null;
-		JDCouponInfo couponInfo = goods.getCouponInfo();
+		JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
 		if (couponInfo != null) {
 			couponUrl = couponInfo.getLink();
 		}

--
Gitblit v1.8.0