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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-09-11 09:48:28 +08:00
commit a21b8f5471
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -46,12 +46,6 @@ class VehicleContractController extends BaseAdminController
]); ]);
VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]); VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]);
}else{ }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]); VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'status'=>1]);
} }

56
app/api/controller/IndexController.php
View File

@ -164,15 +164,18 @@ class IndexController extends BaseApiController
$cars = json_decode($contract['cars_info'], true); $cars = json_decode($contract['cars_info'], true);
$data = []; $data = [];
foreach ($cars as $k => $v) { foreach ($cars as $k => $v) {
$data[$k]['car_id'] = $v['id']; $hasCar = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
$data[$k]['car_license'] = $v['license']; if($hasCar->isEmpty()){
$data[$k]['type'] = 0; $data[$k]['car_id'] = $v['id'];
$data[$k]['status'] = 0; $data[$k]['car_license'] = $v['license'];
$data[$k]['company_id'] = $contract['company_b_id']; $data[$k]['type'] = 0;
$data[$k]['rent_time'] = 0; $data[$k]['status'] = 0;
$data[$k]['rent_company_id'] = 0; $data[$k]['company_id'] = $contract['company_b_id'];
$data[$k]['contract_id'] = $contract['id']; $data[$k]['rent_time'] = 0;
$data[$k]['create_time'] = strtotime($contract['create_time']); $data[$k]['rent_company_id'] = 0;
$data[$k]['contract_id'] = $contract['id'];
$data[$k]['create_time'] = strtotime($contract['create_time']);
}
} }
$vehicleRent = new VehicleRent(); $vehicleRent = new VehicleRent();
$vehicleRent->saveAll($data); $vehicleRent->saveAll($data);
@ -426,22 +429,25 @@ class IndexController extends BaseApiController
} }
$cars = json_decode($model['cars_info'], true); $cars = json_decode($model['cars_info'], true);
$result = $model->where('id', $model['id'])->save($param); $result = $model->where('id', $model['id'])->save($param);
// if ($result && isset($param['status']) && $param['status'] == 3) { if ($result && isset($param['status']) && $param['status'] == 3) {
// $data = []; $data = [];
// foreach ($cars as $k => $v) { foreach ($cars as $k => $v) {
// $data[$k]['car_id'] = $v['id']; $hasCar = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
// $data[$k]['car_license'] = $v['license']; if($hasCar->isEmpty()) {
// $data[$k]['type'] = 0; $data[$k]['car_id'] = $v['id'];
// $data[$k]['status'] = 0; $data[$k]['car_license'] = $v['license'];
// $data[$k]['company_id'] = $model['company_b_id']; $data[$k]['type'] = 0;
// $data[$k]['rent_time'] = 0; $data[$k]['status'] = 0;
// $data[$k]['rent_company_id'] = 0; $data[$k]['company_id'] = $model['company_b_id'];
// $data[$k]['contract_id'] = $model['id']; $data[$k]['rent_time'] = 0;
// $data[$k]['create_time'] = strtotime($model['create_time']); $data[$k]['rent_company_id'] = 0;
// } $data[$k]['contract_id'] = $model['id'];
// $vehicleRent = new VehicleRent(); $data[$k]['create_time'] = strtotime($model['create_time']);
// $vehicleRent->saveAll($data); }
// } }
$vehicleRent = new VehicleRent();
$vehicleRent->saveAll($data);
}
//返回 //返回
return $result ? $this->success('更新成功') : $this->fail('更新失败'); return $result ? $this->success('更新成功') : $this->fail('更新失败');
} }

2
app/api/controller/TaskController.php
View File

@ -93,9 +93,11 @@ class TaskController extends BaseApiController
$parmas['start_time']=date('Y-m-d',$task['start_time']); $parmas['start_time']=date('Y-m-d',$task['start_time']);
$parmas['end_time']=$task['end_time'].' 23:59:59'; $parmas['end_time']=$task['end_time'].' 23:59:59';
$list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); $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) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
$find['extend']=$task['extend']; $find['extend']=$task['extend'];
$find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0;
if($transaction_pool==0){ if($transaction_pool==0){
$find['transaction_pool']=0; $find['transaction_pool']=0;
}else{ }else{

1
app/common/logic/task/TaskLogic.php
View File

@ -74,7 +74,6 @@ class TaskLogic extends BaseLogic
public static function CronAdd(array $v, $datas): bool public static function CronAdd(array $v, $datas): bool
{ {
try { try {
$v['day_count']=$v['day_count']+1;
if ($v['types'] == 3) { if ($v['types'] == 3) {
$task = Task::where('template_id', $v['id'])->find(); $task = Task::where('template_id', $v['id'])->find();
if ($task) { if ($task) {