|
@@ -163,6 +163,7 @@ class UserService extends BaseService
|
|
|
$hasUser = UserClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
|
|
$hasUser = UserClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
|
|
|
$userSource = UserClass::$userSourceId;
|
|
$userSource = UserClass::$userSourceId;
|
|
|
$systemId = $userSource['system']['id'];
|
|
$systemId = $userSource['system']['id'];
|
|
|
|
|
+ Yii::info($hasUser['sourceType'].' -- '.$systemId);
|
|
|
if (!empty($hasUser) && $hasUser['sourceType'] == $systemId) {
|
|
if (!empty($hasUser) && $hasUser['sourceType'] == $systemId) {
|
|
|
UserClass::mergeUser($hasUser, $user);
|
|
UserClass::mergeUser($hasUser, $user);
|
|
|
}
|
|
}
|