From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
index 03b9030..76374c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.wx.WXMPUserLoginService;
@@ -31,6 +32,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
@@ -90,8 +94,8 @@
} else {// 鐧诲綍
UserInfo userInfo = userAccountService.getUserInfoByPhone(loginData.getAppId(), loginData.getPhone());
if (userInfo != null) {// 宸插瓨鍦ㄧ殑鐢ㄦ埛
- UserInfo boss = threeSaleSerivce.getBoss(userInfo.getId());
- if (boss == null) {// 闇�瑕佺粦瀹氶個璇风爜
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(userInfo.getId());
+ if (StringUtil.isNullOrEmpty(inviteCode)) {// 闇�瑕佺粦瀹氶個璇风爜
if (loginData.getBoss() != null) {
// 缁戝畾涓婄骇
return bindInviteCode(loginData.getBoss(), userInfo);
@@ -140,8 +144,8 @@
// 閫氳繃寰俊缃戦〉閭�璇峰叧绯昏繘鏉ョ殑婵�娲荤敓鏁�
threeSaleSerivce.effective(userInfo);
- UserInfo boss = threeSaleSerivce.getBoss(userInfo.getId());
- if (boss == null) {// 闇�瑕佺粦瀹氶個璇风爜
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(userInfo.getId());
+ if (StringUtil.isNullOrEmpty(inviteCode)) {// 闇�瑕佺粦瀹氶個璇风爜
// 鎻愮ず瀹㈡埛绔渶瑕佺粦瀹氶個璇风爜
return new WXMPLoginResult(WXMPLoginResult.CODE_BIND_INVITE_CODE, userInfo);
}
--
Gitblit v1.8.0