|
|
@@ -300,18 +300,19 @@ class UserService extends BaseService
|
|
|
$realName = isset($data['realName']) ? $data['realName'] : $mobile;
|
|
|
$member = isset($data['member']) ? $data['member'] : -1;
|
|
|
$balance = isset($data['balance']) ? $data['balance'] : 0;
|
|
|
+ $growth = isset($data['growth']) ? $data['growth'] : 0;
|
|
|
|
|
|
$originalInfo = [];
|
|
|
$originalInfo['merchantId'] = $merchantId;
|
|
|
$originalInfo['mobile'] = $mobile;
|
|
|
$originalInfo['realName'] = $realName;
|
|
|
-
|
|
|
+ $originalInfo['userName'] = $realName;
|
|
|
+
|
|
|
$user = UserService::replaceUser($originalInfo, $source, $merchantId);
|
|
|
|
|
|
$extend = MerchantExtendService::getByMerchantId($merchantId);
|
|
|
|
|
|
//等级
|
|
|
- $growth = 0;
|
|
|
if ($member > 0) {
|
|
|
$gradeList = xhMerchantExtendService::getGradeList($extend, 'desc');
|
|
|
$growth = isset($gradeList[$member]['growth']) ? $gradeList[$member]['growth'] : 0;
|
|
|
@@ -326,6 +327,7 @@ class UserService extends BaseService
|
|
|
|
|
|
//会员升级
|
|
|
UserIntegralService::increaseToUpgrade(0, $growth, 0, $userId, $merchantId, $extend);
|
|
|
+ return $user;
|
|
|
}
|
|
|
|
|
|
}
|