|
@@ -91,7 +91,7 @@ class MemberService
|
|
|
})->when(!empty($status), function ($query) use ($status) {
|
|
|
$query->where('member_status', $status);
|
|
|
})
|
|
|
- ->select('member_id', 'member_is_vip', 'member_is_owner','member_is_partner','member_is_referrer', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
|
|
|
+ ->select('member_id', 'member_is_vip', 'member_is_owner', 'member_is_partner', 'member_is_referrer', '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_referee', 'member_info.member_info_business', 'member_info.member_info_service', 'member_info.member_info_city', 'member_info.member_info_address', 'member_info.member_info_gender', 'member_info.member_info_birthday',
|
|
|
'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'
|
|
@@ -350,7 +350,13 @@ class MemberService
|
|
|
|
|
|
public static function info($memberId)
|
|
|
{
|
|
|
- $member = Member::with('cert', 'info')
|
|
|
+ $member = Member::with([
|
|
|
+ 'cert',
|
|
|
+ 'info',
|
|
|
+ 'role' => function ($query) {
|
|
|
+ $query->select('member_role_id','member_role_name');
|
|
|
+ }
|
|
|
+ ])
|
|
|
->where('member_id', $memberId)
|
|
|
->first();
|
|
|
if (!$member) {
|
|
@@ -438,6 +444,29 @@ class MemberService
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (!empty($member['join_invite_member_id'])){
|
|
|
+ $inviteMember = Member::with('cert', 'info')
|
|
|
+ ->where('member_id',$member['join_invite_member_id'])
|
|
|
+ ->select('member_id','member_mobile','member_invite_code')
|
|
|
+ ->first();
|
|
|
+ if (!empty($inviteMember)){
|
|
|
+ $inviteMember = $inviteMember->toArray();
|
|
|
+ $mobile = '';
|
|
|
+ if (!empty($inviteMember['member_mobile'])){
|
|
|
+ $mobile = $inviteMember['member_mobile'];
|
|
|
+ }
|
|
|
+ $nickname = '';
|
|
|
+ if (!empty($inviteMember['info']) && !empty($inviteMember['info']['member_info_nickname'])){
|
|
|
+ $nickname = $inviteMember['info']['member_info_nickname'];
|
|
|
+ }
|
|
|
+ $certname = '';
|
|
|
+ if (!empty($inviteMember['cert']) && !empty($inviteMember['cert']['member_info_nickname'])){
|
|
|
+ $nickname = $inviteMember['cert']['member_cert_name'];
|
|
|
+ }
|
|
|
+ $member['invite_name'] = MemberService::getMemberName($mobile,$certname,$nickname);
|
|
|
+ $member['invite_code'] = $inviteMember['member_invite_code'] ?? '';
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
return json_success('', $member);
|
|
|
}
|