From 8d38972b593b5ba698b0e605039ed8c795eaaef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 17:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 18f7272..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
@@ -360,12 +360,19 @@
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);
--
Gitblit v1.8.0