From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 5805a49..be27d3b 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();
}
@@ -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));
@@ -2286,12 +2286,16 @@
}
}
}
+ }
+
+ 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