From 32d0a71284b509a365cc9d1eab6103e8073a7f1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 二月 2019 14:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 27528a3..5805a49 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
@@ -2064,16 +2064,20 @@
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
- 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");
+
if (!StringUtil.isNullOrEmpty(uid)
&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
- } else
+ } 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));
final String tempUid = uid;
--
Gitblit v1.8.0