mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善提现功能：商城商户入驻和开通交易审批流

Browse Source
This commit is contained in:
chenbo 2023-09-19 10:18:50 +08:00
parent c27393331d
commit e4499b9ec1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/controller/CompanyController.php
View File

@ -399,7 +399,6 @@ class CompanyController extends BaseAdminController
'master_email' => $master_email??'',
'type_name' => $params['type_name'] ?? '', //店铺类型
'category_name' => $params['category_name'] ?? '', //商户分类
'face_create_status' => 1,
'qualification' => !empty($params['images'])?$params['images']:json_encode([])
];
$approveModel = new Approve();
@ -407,7 +406,7 @@ class CompanyController extends BaseAdminController
// 插入审批流
$approveModel->type = $shopApproveType == 1? 2: 3; // 审批类型，后台配置 1 其他任务 2商户入驻 3开通交易
$approveModel->flow_id = 2;
$approveModel->name = '商户入驻审批';
$approveModel->name = $shopApproveType == 1? '商户入驻审批': '商户开通交易审批';
$approveModel->admin_id = 0; // 后台发起人id 暂时为0
$approveModel->department_id = '0';
$approveModel->check_admin_ids = $company['area_manager']; // 当前审批人ID 片区经理的admin_id

4
app/api/lists/approve/ApproveLists.php
View File

@ -27,10 +27,10 @@ class ApproveLists extends BaseApiDataLists implements ListsSearchInterface
{
$where = [];
$param = $this->request->param();
if (isset($param['type']) && $param['type'] == 2) {
// if (isset($param['type']) && $param['type'] == 2) {
$adminId = User::where(['id' => $this->userId])->with('company')->value('admin_id');
$where[] = ['check_admin_ids', '=', $adminId]; // 只有片区经理才能查看
}
// }
return $where;
}