|
@@ -81,7 +81,7 @@ class MemberService
|
|
|
$query->whereBetween('member.member_addtimes', $addtime);
|
|
|
})
|
|
|
->select('member_id', 'member_is_vip', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
|
|
|
- 'member_info.member_info_nickname', 'member_info.member_info_headimg',
|
|
|
+ 'member_info.member_info_nickname', 'member_info.member_info_headimg','member_info.member_info_referee','member_info.member_info_business','member_info.member_info_service',
|
|
|
'member_role.member_role_id', 'member_role.member_role_name',
|
|
|
'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
|
|
|
// 'member_account.member_account_surplus'
|
|
@@ -97,7 +97,10 @@ class MemberService
|
|
|
$row['member_mobile'] = substr($row['member_mobile'], 0, 3) . '****' . substr($row['member_mobile'], 7);
|
|
|
$row['info'] = [
|
|
|
'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'], -4, 4) . '用户',
|
|
|
- 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : ''
|
|
|
+ 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : '',
|
|
|
+ 'member_info_referee' => !empty($row['member_info_referee']) ? $row['member_info_referee'] : '',
|
|
|
+ 'member_info_business' => !empty($row['member_info_business']) ? $row['member_info_business'] : '',
|
|
|
+ 'member_info_service' => !empty($row['member_info_service']) ? $row['member_info_service'] : ''
|
|
|
];
|
|
|
$row['cert'] = [
|
|
|
'member_cert_birth' => $row['member_cert_birth'],
|
|
@@ -235,7 +238,7 @@ class MemberService
|
|
|
$addtime[1] = strtotime($addtime[1]);
|
|
|
$query->whereBetween('member.member_addtimes', $addtime);
|
|
|
})->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
|
|
|
- 'member_info.member_info_nickname', 'member_info.member_info_headimg',
|
|
|
+ 'member_info.member_info_nickname', 'member_info.member_info_headimg','member_info.member_info_referee','member_info.member_info_business','member_info.member_info_service',
|
|
|
'member_role.member_role_id', 'member_role.member_role_name',
|
|
|
'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
|
|
|
// 'member_account.member_account_surplus'
|
|
@@ -247,7 +250,10 @@ class MemberService
|
|
|
foreach ($rows as $row) {
|
|
|
$row['info'] = [
|
|
|
'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'], -4, 4) . '用户',
|
|
|
- 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : ''
|
|
|
+ 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : '',
|
|
|
+ 'member_info_referee' => !empty($row['member_info_referee']) ? $row['member_info_referee'] : '',
|
|
|
+ 'member_info_business' => !empty($row['member_info_business']) ? $row['member_info_business'] : '',
|
|
|
+ 'member_info_service' => !empty($row['member_info_service']) ? $row['member_info_service'] : ''
|
|
|
];
|
|
|
$row['cert'] = [
|
|
|
'member_cert_name' => $row['member_cert_name'],
|
|
@@ -299,7 +305,10 @@ class MemberService
|
|
|
'points' => isset($account['points']) ? $account['points']['member_account_surplus'] + $account['points']['member_account_added'] : 0,
|
|
|
'is_auth' => $row['is_auth'],
|
|
|
'level' => $row['member_role_name'] ?? '普通用户',
|
|
|
- 'member_addtimes' => $row['member_addtimes']
|
|
|
+ 'member_addtimes' => $row['member_addtimes'],
|
|
|
+ 'member_info_referee' => $row['info']['member_info_referee'] ?? '',
|
|
|
+ 'member_info_business' => $row['info']['member_info_business'] ?? '',
|
|
|
+ 'member_info_service' => $row['info']['member_info_service'] ?? '',
|
|
|
];
|
|
|
}
|
|
|
return json_success('', $exportData);
|
|
@@ -317,7 +326,10 @@ class MemberService
|
|
|
$member = $member->toArray();
|
|
|
$member['info'] = [
|
|
|
'member_info_nickname' => !empty($member['info']) && !empty($member['info']['member_info_nickname']) ? $member['info']['member_info_nickname'] : substr($member['member_mobile'], -4, 4) . '用户',
|
|
|
- 'member_info_headimg' => !empty($member['info']) && !empty($member['info']['member_info_headimg']) ? $member['info']['member_info_headimg'] : ''
|
|
|
+ 'member_info_headimg' => !empty($member['info']) && !empty($member['info']['member_info_headimg']) ? $member['info']['member_info_headimg'] : '',
|
|
|
+ 'member_info_referee' => !empty($member['info']) && !empty($member['info']['member_info_referee']) ? $member['info']['member_info_referee'] : '',
|
|
|
+ 'member_info_business' => !empty($member['info']) && !empty($member['info']['member_info_business']) ? $member['info']['member_info_business'] : '',
|
|
|
+ 'member_info_service' => !empty($member['info']) && !empty($member['info']['member_info_service']) ? $member['info']['member_info_service'] : '',
|
|
|
];
|
|
|
$member['cert'] = [
|
|
|
'member_cert_birth' => $member['cert']['member_cert_birth'] ?? '',
|
|
@@ -849,7 +861,10 @@ class MemberService
|
|
|
$infoData = [
|
|
|
'join_info_member_id' => $memberId,
|
|
|
'member_info_nickname' => $params['account_name'] ?? '',
|
|
|
- 'member_info_headimg' => !empty($params['avatar']) ? getenv('SYSTEM_AVATAR_DOMAIN') . str_replace(getenv('STORAGE_DOMAIN'), '', $params['avatar']) : ''
|
|
|
+ 'member_info_headimg' => !empty($params['avatar']) ? getenv('SYSTEM_AVATAR_DOMAIN') . str_replace(getenv('STORAGE_DOMAIN'), '', $params['avatar']) : '',
|
|
|
+ 'member_info_referee' => $params['member_info_referee'] ?? '',
|
|
|
+ 'member_info_business' => $params['member_info_business'] ?? '',
|
|
|
+ 'member_info_service' => $params['member_info_service'] ?? '',
|
|
|
];
|
|
|
MemberInfo::insert($infoData);
|
|
|
|
|
@@ -939,7 +954,10 @@ class MemberService
|
|
|
$infoData = [
|
|
|
'join_info_member_id' => $memberId,
|
|
|
'member_info_nickname' => $params['account_name'],
|
|
|
- 'member_info_headimg' => $avatar
|
|
|
+ 'member_info_headimg' => $avatar,
|
|
|
+ 'member_info_referee' => $params['member_info_referee'] ?? '',
|
|
|
+ 'member_info_business' => $params['member_info_business'] ?? '',
|
|
|
+ 'member_info_service' => $params['member_info_service'] ?? '',
|
|
|
];
|
|
|
if (!MemberInfo::where('join_info_member_id', $params['member_id'])->exists()) {
|
|
|
MemberInfo::insert($infoData);
|