Merge branch 'hotfix/promote_add_bug' of wmtx/platform into release

添加推广员内外团属性跟随上级
master
廖金灵 5 years ago committed by Gogs
commit 8abd68c2e1

@ -945,6 +945,7 @@ class PromoteService {
'create_time' => time(),
'company_belong' => $params['company_belong'] ?? 0,
'company_relation' => $params['company_relation'] ?? 0,
'settlement_type' => $params['settlement_type'] ?? 1,
'group_remark' => $params['group_remark'] ?? '',
];

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

Loading…
Cancel
Save