diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php index d8e937ccc..febc541ad 100644 --- a/app/adminapi/controller/task_template/TaskTemplateController.php +++ b/app/adminapi/controller/task_template/TaskTemplateController.php @@ -54,7 +54,14 @@ class TaskTemplateController extends BaseAdminController { $params = (new TaskTemplateValidate())->post()->goCheck('add'); $params['admin_id'] = $this->adminId; - $result = TaskTemplateLogic::add($params); + $company = Company::find($params['company_id']); + if ($company->company_type == 41) { + // 创建 镇管理公司 任务模板 + $result = TaskTemplateLogic::addTownTaskTemplate($params); + } else { + $result = TaskTemplateLogic::add($params); + } + if (true === $result) { /** * 如果是公司第一次创建安排任务,则初始化公司的提现周期截止时间 diff --git a/app/adminapi/lists/finance/WithdrawLists.php b/app/adminapi/lists/finance/WithdrawLists.php index cf46b1706..60e761f92 100644 --- a/app/adminapi/lists/finance/WithdrawLists.php +++ b/app/adminapi/lists/finance/WithdrawLists.php @@ -52,7 +52,7 @@ class WithdrawLists extends BaseAdminDataLists implements ListsSearchInterface ->where($this->queryWhere()) ->withAttr('company_name', function ($value, $data) { $company = Company::where(['admin_id'=>$data['admin_id']])->find(); - return $company['company_name']; + return $company['company_name']??''; }) ->withAttr('s_date', function ($value, $data) { $withdrawedCount = Withdraw::where(['user_id'=>$data['user_id'], 'status'=>3])->count(); diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php index dd5d3675f..0f11c9ade 100644 --- a/app/common/logic/task_template/TaskTemplateLogic.php +++ b/app/common/logic/task_template/TaskTemplateLogic.php @@ -225,7 +225,7 @@ class TaskTemplateLogic extends BaseLogic { // 如果是公司第一次创建安排任务,初始化公司的可提现周期截止时间 $templateCount = TaskTemplate::where(['company_id'=>$params['company_id']])->count(); - if ($templateCount == 0) { + if ($templateCount == 1) { $dictData = ConfigLogic::getDictTypeValueByType('withdraw_cycle'); $cycle = $dictData['withdraw_cycle_1']['value']; // 数据字典-提现周期 单位:天数 $today = strtotime(date('Y-m-d')); @@ -293,6 +293,8 @@ class TaskTemplateLogic extends BaseLogic 'stage_day_two' => $params['stage_day_two']??0, 'proportion_two' => $params['proportion_two']??0, 'recharge' => $params['recharge']??0, + 'stage_day_three' => $params['stage_day_three']??0, + 'new_money_three' => $params['new_money_three']??0, ]); Db::commit(); return true;