From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index a24cf19..18f7272 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -349,15 +349,15 @@
* @param out
*/
@RequestMapping(value = "getVIPInfo")
- public void getVIPInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getVIPInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null) {
- out.print(JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉瀛樺湪"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
return;
}
@@ -416,6 +416,11 @@
vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
vo.setLimitgoldCoin(new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));
- out.print(JsonUtil.loadTrueResult(vo));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(vo)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(vo));
+ }
}
}
--
Gitblit v1.8.0