From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
index 19cc2b2..1c8df95 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -58,6 +58,7 @@
 	private UserInfoService userInfoService;
 
 	@Resource
+	@Lazy
 	private UserSystemCouponService userSystemCouponService;
 
 	@Resource
@@ -257,7 +258,7 @@
 		}
 
 		if (StringUtil.isNullOrEmpty(nickName))
-			nickName = Constant.systemCommonConfig.getDefaultNickName();
+			nickName = Constant.systemCommonConfig.getDefaultNickName() + inviteId;
 
 		if (StringUtil.isNullOrEmpty(portrait))
 			portrait = Constant.systemCommonConfig.getDefaultPortrait();

--
Gitblit v1.8.0