From c987318c7cf02e51fe6c9c98e75bfcc47058841b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 四月 2019 16:36:28 +0800
Subject: [PATCH] 优化部分功能,添加京东

---
 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index 0207ec7..a41c2ea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -40,6 +40,7 @@
 import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
 import com.yeshi.fanli.util.AESUtil;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
@@ -276,13 +277,24 @@
 			goods.setImgList(new ArrayList<>());
 		goods.getImgList().add(0, TbImgUtil.getTBSizeImg(goods.getPictUrl(), 300));
 		data.put("imgs", goods.getImgList());
+		data.put("couponPrice", afterCouponPrice);
+		// 鑰佺増鏈吋瀹�
 		data.put("quanPrice", afterCouponPrice);
 		data.put("zkPrice", goods.getZkPrice());
 		data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
 		data.put("token", link.getTaoToken());
-		data.put("quan", !StringUtil.isNullOrEmpty(goods.getCouponInfo()));
 		data.put("reservePrice", goods.getReservePrice());
 		data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
+		if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
+			data.put("couponAmount", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()));
+			data.put("coupon", true);
+			// 鑰佺増鏈吋瀹�
+			data.put("quan", true);
+		} else {
+			data.put("coupon", false);
+			// 鑰佺増鏈吋瀹�
+			data.put("quan", true);
+		}
 		out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
 
 		final String tempUid = uid;

--
Gitblit v1.8.0