From 9dedfa92c34c92d42230e151766726a8e4a7806f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 15:10:39 +0800
Subject: [PATCH] 邀请队员免单券 活动跳转地址修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 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..6158a8a 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
@@ -1988,7 +1988,7 @@
if (from != null && from.equals("miandan")) {
// 鍏嶅崟鍟嗗搧
- hongBao = quanPrice.toString();
+ hongBao = "楼" + quanPrice.toString();
}
@@ -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
- 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));
final String tempUid = uid;
@@ -2268,26 +2272,31 @@
jumpDetail.setId(null);
jumpDetail.setName(null);
}
- // 閭�璇风櫥闄嗛獙璇�
- if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()
- && uid != null) {
-
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
- && userInfoExtra.getInviteCode().trim().length() > 0) {
-
- JSONObject params = new JSONObject();
- params.put("url", configService.get("invite_activation_success_url"));
- special.setParams(params.toString());
- }
- }
+
+ /* 閭�璇疯烦杞彇娑堣烦杞縺娲绘垚鍔熼〉闈�
+ * // 閭�璇风櫥闄嗛獙璇� if(jumpDetail.getType().equals("invite_web") &&
+ * jumpDetail.getNeedLogin() && uid != null) {
+ *
+ * UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); if
+ * (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&
+ * userInfoExtra.getInviteCode().trim().length() > 0) {
+ *
+ * JSONObject params = new JSONObject(); params.put("url",
+ * configService.get("invite_activation_success_url"));
+ * special.setParams(params.toString()); } }
+ */
+
}
+ }
+
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
}
JSONObject root = new JSONObject();
root.put("special", listSpecial);
-
out.print(JsonUtil.loadTrueResult(root));
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0