Merge branch 'release' into dev

master
ELF 5 years ago
commit 69e4c3fbd7

@ -930,14 +930,14 @@ class PromoteService {
'real_name' => $params['real_name'], 'real_name' => $params['real_name'],
'email' => $params['email'], 'email' => $params['email'],
'idcard' => $params['idcard'] ?? '', 'idcard' => $params['idcard'] ?? '',
'status' => $params['status'], 'status' => $params['status'] ?? 0,
'mobile_phone' => $params['mobile_phone'], 'mobile_phone' => $params['mobile_phone'],
'bank_name' => $params['bank_name'] ?? '', 'bank_name' => $params['bank_name'] ?? '',
'bank_card' => $params['bank_card'], 'bank_card' => $params['bank_card'],
'parent_id' => $parent ? $parent['id'] : 0, 'parent_id' => $parent ? $parent['id'] : 0,
'parent_name' => $parent ? $parent['account'] : '官方渠道', 'parent_name' => $parent ? $parent['account'] : '官方渠道',
'admin_id' => $params['admin_id'] ?? 0, 'admin_id' => $params['admin_id'] ?? 0,
'company_id' => $params['company_id'] ?? 0, 'company_id' => $params['company_id'] ?? 0,
'invite_code' => $params['invite_code'] ?? '', 'invite_code' => $params['invite_code'] ?? '',
'create_time' => time(), 'create_time' => time(),
]; ];

@ -985,6 +985,9 @@ class PromoteController extends BaseController
} else { } else {
$parent = $loginPromote; $parent = $loginPromote;
} }
if ($parent) {
$params['company_id'] = $parent['company_id'];
}
if (C('PROMOTE_AUTO_AUDIT') == 1) { if (C('PROMOTE_AUTO_AUDIT') == 1) {
$params['status'] = 1; $params['status'] = 1;
} }

Loading…
Cancel
Save