|
|
@@ -274,6 +274,7 @@ public class WxUserScrmController extends AppBaseController {
|
|
|
// 解密
|
|
|
WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
|
|
|
FsUserScrm user=new FsUserScrm();
|
|
|
+ logger.info("===========用户unionid:{},用户openid:{}",session.getUnionid(),session.getOpenid());
|
|
|
if (session.getUnionid()!=null){
|
|
|
user = userService.selectFsUserByUnionid(session.getUnionid());
|
|
|
if (user==null){
|
|
|
@@ -288,7 +289,11 @@ public class WxUserScrmController extends AppBaseController {
|
|
|
//新用户
|
|
|
String phoneNumber = phoneNoInfo.getPhoneNumber();
|
|
|
//查询手机号是否存在,如果存在,更新
|
|
|
- FsUserScrm checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
|
|
|
+ FsUserScrm checkPhone = null;
|
|
|
+ if(StringUtils.isNotEmpty(phoneNumber)){
|
|
|
+ checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
|
|
|
+ }
|
|
|
+
|
|
|
if (checkPhone==null){
|
|
|
checkPhone=userService.selectFsUserByPhone(phoneNumber);
|
|
|
}
|