From d0049dea01d9733eb7d5c2bea58325a64a1b642a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 04 十二月 2019 09:27:35 +0800
Subject: [PATCH] 品牌
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..b30d2bb 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,23 +349,30 @@
* @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;
}
-
+ //
+ String inviteCode = "";
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ inviteCode = userInfoExtra.getInviteCode();
+
UserVipRateVO vo = new UserVipRateVO();
vo.setId(uid);
+ vo.setInviteCode(inviteCode);
vo.setNickName(userInfo.getNickName());
vo.setPortrait(userInfo.getPortrait());
vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
+ vo.setCsdLink(configService.get("customer_service_link"));
// 鐪侀挶 -鑷喘浜х敓杩斿埄
BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
@@ -416,6 +423,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