From 19653419a1af9c38d3cb897c2354be05f7293885 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 31 Aug 2023 17:19:51 +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 | 18 +++++++++++++++++ app/api/controller/CompanyController.php | 14 ++++++++----- app/common/logic/task/TaskLogic.php | 25 +++++++++++++----------- app/job/TaskInformationJob.php | 14 +++++++++++-- 4 files changed, 53 insertions(+), 18 deletions(-) diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php index c97908b78..4d21436e9 100644 --- a/app/api/controller/CeshiController.php +++ b/app/api/controller/CeshiController.php @@ -24,6 +24,24 @@ class CeshiController extends BaseApiController public function index() { + $transaction_pool=780; + $shang_date_total_price=[ + 'arr'=>['total_price'=>305,'day_money'=>580] + ]; + if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){ + if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){ + $shang_date_total_price['arr']['supplement']=bcsub($shang_date_total_price['arr']['day_money'],$shang_date_total_price['arr']['total_price'],2); + }else{ + $shang_date_total_price['arr']['supplement']=0; + $shang_date_total_price['arr']['after_transaction_pool']=0; + } + $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool; + Task::where('id', 839)->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]); + + $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少 + + TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]); + } // $all=TaskSchedulingPlan::where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); // foreach($all as $k=>$v){ // queue(TaskInformationJob::class,$v); diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index e5a29b1ae..175209270 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -193,11 +193,14 @@ class CompanyController extends BaseApiController */ public function shareholder_info(){ // $params = $this->request->param(); - $find=Company::where('id',$this->userInfo['company_id'])->field('is_contract,shareholder_money,village')->find()->toArray(); - if($find &&$find['is_contract']==1){ - $contract=Contract::where('party_b',$this->userInfo['company_id'])->field('contract_url,create_time')->find(); - $find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url']; - $find['contract_time']=$contract['create_time']; + $find=Company::where('id',$this->userInfo['company_id'])->field('shareholder_money,village')->find()->toArray(); + if($find){ + $contract=Contract::where('party_b',$this->userInfo['company_id'])->where('contract_type',40)->field('contract_url,create_time')->find(); + if($contract){ + $find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url']; + $find['contract_time']=$contract['create_time']; + $find['is_contract']=1; + } $village_info=Company::where('village',$find['village'])->where('company_type',17)->find(); if($village_info){ $find['is_amount_turned']=1; @@ -205,6 +208,7 @@ class CompanyController extends BaseApiController $find['is_amount_turned']=0; } }else{ + $find['is_contract']=0; $find['contract_url']=''; $find['contract_time']=''; $find['is_amount_turned']=0; diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 6d67c7618..c77296039 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -123,10 +123,10 @@ class TaskLogic extends BaseLogic //入股任务 if ($v['type'] == 35) { $responsible_area = Company::where('id', $v['company_id'])->value('responsible_area'); - if($responsible_area){ - $responsible_area=explode(',',$responsible_area); - }else{ - Log::error('定时任务添加失败:没有区域'.json_encode($v)); + if ($responsible_area) { + $responsible_area = explode(',', $responsible_area); + } else { + Log::error('定时任务添加失败:没有区域' . json_encode($v)); return false; } if (isset($v['extend']['shareholder'])) { @@ -135,10 +135,9 @@ class TaskLogic extends BaseLogic $v['extend']['shareholder']['money'] = $v['recharge']; $v['extend']['shareholder']['over_decimal'] = $v['over_decimal']; foreach ($responsible_area as $kkk => $vvv) { - $v['extend']['shareholder']['user_list'][$kkk] = ['info'=>$shareholder_user['nickname'].'需缴纳'.$vvv.'队,股金:'.bcdiv($v['recharge'],count($responsible_area),2), 'time' => $v['create_time']]; + $v['extend']['shareholder']['user_list'][$kkk] = ['info' => $shareholder_user['nickname'] . '需缴纳' . $vvv . '队,股金:' . bcdiv($v['recharge'], count($responsible_area), 2), 'time' => $v['create_time']]; } $data['director_uid'] = $v['extend']['shareholder']['user_id']; - } $data['extend'] = json_encode($v['extend']); } @@ -157,11 +156,15 @@ class TaskLogic extends BaseLogic } else { $user_count_money = 58 * $user_count_two; } - if($user_count_money<$v['transaction_pool']){ - TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]); - }else{ - TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]); - } + $extend = [ + 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price'=>0]] + ]; + $data['extend'] = json_encode($extend); + // if($user_count_money<$v['transaction_pool']){ + // TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]); + // }else{ + // TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]); + // } } $task_id = (new Task())->insertGetId($data); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]); diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index bc35f6bef..527f5fa80 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -51,9 +51,19 @@ class TaskInformationJob $transaction_pool=$data['template_info']['transaction_pool'];//交易金额剩余池 if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){ + if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){ + $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少 + + $shang_date_total_price['arr']['supplement']=$day_money; + $transaction_pool=$shang_date_total_price['arr']['supplement']; + }else{ + $shang_date_total_price['arr']['supplement']=0; + $shang_date_total_price['arr']['after_transaction_pool']=0; + $day_money=0; + } + $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool; Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]); - $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少 - TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]); + TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcsub($transaction_pool,$day_money,2)]); $shang_date_total_price['arr']['status']=1; } $name = $shang_date_total_price['name'];