diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php index ca60759df..dfa6a1a5b 100644 --- a/app/adminapi/controller/contract/ContractController.php +++ b/app/adminapi/controller/contract/ContractController.php @@ -181,15 +181,16 @@ class ContractController extends BaseAdminController public function evidence() { - $parms = Request::param(); - $detail=ContractLogic::detail($parms); + $id = Request::param('id'); + $detail=Contract::where('id',$id)->find(); if(!empty($detail['evidence_url'])){ return $this->success('获取成功', ['url' => env('url.url_prefix').$detail['evidence_url']]); } + $company=Company::where('id',$detail['party_a'])->find(); $request = array( "applyNo" => $detail['contract_no'], - "fullName" => $detail['party_a_info']['company_name'], - "identityCard" => $detail['party_a_info']['organization_code'], + "fullName" => $company['company_name'], + "identityCard" => $company['organization_code'], "identityType" => 12, ); return app(JunziqianController::class)->EvidenceDownload($request); diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 3b8102cb4..d0aa7c2fa 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) {