From b53cb00c05871619fc06df508b07fec638c18990 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Sat, 9 Sep 2023 20:15:50 +0800 Subject: [PATCH 1/3] update notify --- .../contract/VehicleContractController.php | 6 -- app/api/controller/IndexController.php | 56 ++++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index f26397474..b356fcb2e 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -46,12 +46,6 @@ class VehicleContractController extends BaseAdminController ]); VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]); }else{ - //更新物流系统 - curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[ - 'id' => $vehicle_contract['contract_logistic_id'], - 'file' => $params['file'], - 'status' => 1, - ]); VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'status'=>1]); } diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 160073372..52b61ba6f 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -164,15 +164,18 @@ class IndexController extends BaseApiController $cars = json_decode($contract['cars_info'], true); $data = []; foreach ($cars as $k => $v) { - $data[$k]['car_id'] = $v['id']; - $data[$k]['car_license'] = $v['license']; - $data[$k]['type'] = 0; - $data[$k]['status'] = 0; - $data[$k]['company_id'] = $contract['company_b_id']; - $data[$k]['rent_time'] = 0; - $data[$k]['rent_company_id'] = 0; - $data[$k]['contract_id'] = $contract['id']; - $data[$k]['create_time'] = strtotime($contract['create_time']); + $hasCar = VehicleRent::where('car_id',$v['id'])->find(); + if($hasCar->isEmpty()){ + $data[$k]['car_id'] = $v['id']; + $data[$k]['car_license'] = $v['license']; + $data[$k]['type'] = 0; + $data[$k]['status'] = 0; + $data[$k]['company_id'] = $contract['company_b_id']; + $data[$k]['rent_time'] = 0; + $data[$k]['rent_company_id'] = 0; + $data[$k]['contract_id'] = $contract['id']; + $data[$k]['create_time'] = strtotime($contract['create_time']); + } } $vehicleRent = new VehicleRent(); $vehicleRent->saveAll($data); @@ -426,22 +429,25 @@ class IndexController extends BaseApiController } $cars = json_decode($model['cars_info'], true); $result = $model->where('id', $model['id'])->save($param); -// if ($result && isset($param['status']) && $param['status'] == 3) { -// $data = []; -// foreach ($cars as $k => $v) { -// $data[$k]['car_id'] = $v['id']; -// $data[$k]['car_license'] = $v['license']; -// $data[$k]['type'] = 0; -// $data[$k]['status'] = 0; -// $data[$k]['company_id'] = $model['company_b_id']; -// $data[$k]['rent_time'] = 0; -// $data[$k]['rent_company_id'] = 0; -// $data[$k]['contract_id'] = $model['id']; -// $data[$k]['create_time'] = strtotime($model['create_time']); -// } -// $vehicleRent = new VehicleRent(); -// $vehicleRent->saveAll($data); -// } + if ($result && isset($param['status']) && $param['status'] == 3) { + $data = []; + foreach ($cars as $k => $v) { + $hasCar = VehicleRent::where('car_id',$v['id'])->find(); + if($hasCar->isEmpty()) { + $data[$k]['car_id'] = $v['id']; + $data[$k]['car_license'] = $v['license']; + $data[$k]['type'] = 0; + $data[$k]['status'] = 0; + $data[$k]['company_id'] = $model['company_b_id']; + $data[$k]['rent_time'] = 0; + $data[$k]['rent_company_id'] = 0; + $data[$k]['contract_id'] = $model['id']; + $data[$k]['create_time'] = strtotime($model['create_time']); + } + } + $vehicleRent = new VehicleRent(); + $vehicleRent->saveAll($data); + } //返回 return $result ? $this->success('更新成功') : $this->fail('更新失败'); } From 25228c773f669e55c035c764461e0d298dc7c2d7 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Sat, 9 Sep 2023 20:29:10 +0800 Subject: [PATCH 2/3] update notify --- app/api/controller/IndexController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 52b61ba6f..12bda7c55 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -164,7 +164,7 @@ class IndexController extends BaseApiController $cars = json_decode($contract['cars_info'], true); $data = []; foreach ($cars as $k => $v) { - $hasCar = VehicleRent::where('car_id',$v['id'])->find(); + $hasCar = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); if($hasCar->isEmpty()){ $data[$k]['car_id'] = $v['id']; $data[$k]['car_license'] = $v['license']; @@ -432,7 +432,7 @@ class IndexController extends BaseApiController if ($result && isset($param['status']) && $param['status'] == 3) { $data = []; foreach ($cars as $k => $v) { - $hasCar = VehicleRent::where('car_id',$v['id'])->find(); + $hasCar = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); if($hasCar->isEmpty()) { $data[$k]['car_id'] = $v['id']; $data[$k]['car_license'] = $v['license']; From 2c95c0b8e34eb791f743ffbafc2e3963918edf13 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Sat, 9 Sep 2023 22:00:39 +0800 Subject: [PATCH 3/3] =?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/TaskController.php | 2 ++ app/common/logic/task/TaskLogic.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index a3ed2ffb6..dc971ece8 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -93,9 +93,11 @@ class TaskController extends BaseApiController $parmas['start_time']=date('Y-m-d',$task['start_time']); $parmas['end_time']=$task['end_time'].' 23:59:59'; $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); + $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas); if ($task != false) { $find['list'] = $list; $find['extend']=$task['extend']; + $find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0; if($transaction_pool==0){ $find['transaction_pool']=0; }else{ diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 2bcac52da..5edb7cf13 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -74,7 +74,6 @@ class TaskLogic extends BaseLogic public static function CronAdd(array $v, $datas): bool { try { - $v['day_count']=$v['day_count']+1; if ($v['types'] == 3) { $task = Task::where('template_id', $v['id'])->find(); if ($task) {