From 7977019af090ef289db0d814364b0e6c79081298 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 30 Aug 2023 14:16:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CeshiController.php | 23 +++++++++++++++++------ app/api/controller/CompanyController.php | 5 ++++- app/api/controller/CronController.php | 4 +++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php index c24353f3b..ddc22f957 100644 --- a/app/api/controller/CeshiController.php +++ b/app/api/controller/CeshiController.php @@ -21,13 +21,24 @@ class CeshiController extends BaseApiController */ public function index() { -// $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); -// halt($all); - $all=TaskSchedulingPlan::whereDay('end_time')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); - foreach($all as $k=>$v){ - queue(TaskInformationJob::class,$v); + $user_ids = User::where('company_id', $datas['company_id'])->where('is_captain', 1)->field('id,nickname,brigade')->select(); + $director_uid = Task::where('id', $datas['task_id'])->value('director_uid'); + $shareholder_user = User::where('id', $director_uid)->field('id,nickname,brigade')->find(); + $money=bcdiv($data['money'],count($user_ids),2); + foreach ($user_ids as $kkk => $vvv) { + $company_log = [ + 'sn' => generate_sn(UserAccountLog::class, 'sn', 20), + 'company_id'=>$datas['company_id'], + 'change_object' => CompanyAccountLog::SHAREHOLDER,//变动对象 + 'change_type' => CompanyAccountLog::TASK_INC_SHAREHOLDER_MONEY,//变动类型 + 'action' => CompanyAccountLog::INC,//1-增加 2-减少 + 'left_amount' =>bcadd($company['shareholder_money'],$money,2),//变动后数量 + 'change_amount' => $money,//变动数量 + 'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:', + 'status'=>1, + ]; + CompanyAccountLog::create($company_log); } - halt(1); } /** diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 629d60edb..a8368a47d 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -195,9 +195,12 @@ class CompanyController extends BaseApiController // $params = $this->request->param(); $find=Company::where('id',$this->userInfo['company_id'])->field('is_contract,shareholder_money')->find()->toArray(); if($find &&$find['is_contract']==1){ - $find['contract_url']=Contract::where('party_b',$this->userInfo['company_id'])->value('contract_url'); + $contract=Contract::where('party_b',$this->userInfo['company_id'])->field('contract_url,create_time')->find(); + $find['contract_url']='https://worker-task.lihaink.cn/uploads/contract/'.$contract['contract_url']; + $find['contract_time']=$contract['create_time']; }else{ $find['contract_url']=''; + $find['contract_time']=''; } return $this->success('ok',$find); } diff --git a/app/api/controller/CronController.php b/app/api/controller/CronController.php index 9f35dd549..aedfbc4d9 100644 --- a/app/api/controller/CronController.php +++ b/app/api/controller/CronController.php @@ -14,8 +14,10 @@ use app\common\model\task_scheduling\TaskScheduling; * Class IndexController * @package app\api\controller */ -class HetongController extends BaseApiController +class CronController extends BaseApiController { + public array $notNeedLogin = ['settlement','task_add']; + /** * 结算 */