From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 10 四月 2020 17:02:51 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
index 1e8a31c..413a6e1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -183,21 +183,21 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getOrderCouponList", method = RequestMethod.POST)
- public void getOrderCouponList(AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {
+ @RequestMapping(value = "getOrderCouponList")
+ public void getOrderCouponList(String callback, AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {
if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {
- out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁俊鎭笉瀹屾暣"));
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("浼犻�掑弬鏁颁俊鎭笉瀹屾暣"));
return;
}
if (userVIPInfoService.isVIP(uid)) {
- out.print(JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
return;
}
List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);
if (listOrder == null || listOrder.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璁㈠崟鍙蜂笉瀛樺湪"));
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("璁㈠崟鍙蜂笉瀛樺湪"));
return;
}
@@ -206,7 +206,7 @@
for (CommonOrder commonOrder: listOrder) {
Integer wholeOrder = commonOrder.getStateWholeOrder();
if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO == wholeOrder) {
- out.print(JsonUtil.loadFalseResult("鏁翠釜璁㈠崟宸插け鏁�"));
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("鏁翠釜璁㈠崟宸插け鏁�"));
return;
}
@@ -233,11 +233,11 @@
data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
data.put("count", resultList.size());
data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
- out.print(JsonUtil.loadTrueResult(data));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (UserSystemCouponException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
- out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0