|
@@ -642,7 +642,9 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
|
|
// 手机号已经存在
|
|
// 手机号已经存在
|
|
if (StringUtil.isNotEmpty(mobile) && user == null) {
|
|
if (StringUtil.isNotEmpty(mobile) && user == null) {
|
|
user = queryMemberByMobile(merchantId, mobile);
|
|
user = queryMemberByMobile(merchantId, mobile);
|
|
- user.setOpenId(openId);
|
|
|
|
|
|
+ if (user != null) {
|
|
|
|
+ user.setOpenId(openId);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (user == null) {
|
|
if (user == null) {
|