From 72e07a5bbfb57b0480779c54ba6aac84ceb7c315 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 11:29:03 +0800
Subject: [PATCH] 取消分享活动

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 3e4eacf..fb1d643 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2065,18 +2065,18 @@
 		data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
 
 		
-
-		if (!StringUtil.isNullOrEmpty(uid)
-				&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
-		} else if(!"miandan".equals(from)) {
-			// 闈炲厤鍗曞晢鍝�
-			JSONObject shareActivity = new JSONObject();
-			shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
-					new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
-			shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
-			
-			data.put("shareActivity", shareActivity);
-		} 
+//		鍙栨秷鍒嗕韩娲诲姩
+//		if (!StringUtil.isNullOrEmpty(uid)
+//				&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+//		} else if(!"miandan".equals(from)) {
+//			// 闈炲厤鍗曞晢鍝�
+//			JSONObject shareActivity = new JSONObject();
+//			shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
+//					new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+//			shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
+//			
+//			data.put("shareActivity", shareActivity);
+//		} 
 		
 		out.print(JsonUtil.loadTrueResult(data));
 

--
Gitblit v1.8.0