From 0dc81dc9086d40f8427dccf4fa74b527898ad544 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 15:53:07 +0800
Subject: [PATCH] 用返利奖励券最高返修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index c018eb5..14a14b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2555,11 +2555,11 @@
* @param out
*/
@RequestMapping(value = "getSpecialActivities")
- public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
platformCode, Integer.parseInt(acceptData.getVersion()));
-
+
List<Special> list = new ArrayList<Special>();
if (listSpecial != null) {
list.addAll(listSpecial);
@@ -2594,6 +2594,9 @@
JSONObject root = new JSONObject();
root.put("special", JsonUtil.getApiCommonGson().toJson(list));
- out.print(JsonUtil.loadTrueResult(root));
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(root));
+ else
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(root));
}
}
--
Gitblit v1.8.0