From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index b4d5841..387b5e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -190,6 +190,11 @@
 				 + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
 		data.put("inviteLink", shortLink);
 		
+		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+		if (userInfoExtra != null) {
+			data.put("inviteCode", userInfoExtra.getInviteCode());
+		}
+		
 		// 閭�璇疯鍒�
 		String key = "inviteRules"; // key鍊�
 		BusinessSystem system = new BusinessSystem();

--
Gitblit v1.8.0