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

Merge pull request 'mkm' (#40) from mkm into dev

Browse Source 
Reviewed-on: #40
This commit is contained in:
mkm 2023-09-09 11:47:15 +08:00
commit 569998ef8d
4 changed files with 126 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/adminapi/controller/contract/ContractController.php
View File

@ -178,4 +178,17 @@ class ContractController extends BaseAdminController
}
}
}
public function evidence()
{
$parms = Request::param();
$detail=ContractLogic::detail($parms);
$request = array(
"applyNo" => $detail['contract_no'],
"fullName" => $detail['party_a_info']['company_name'],
"identityCard" => $detail['party_a_info']['organization_code'],
"identityType" => 12,
);
return app(JunziqianController::class)->EvidenceDownload($request);
}
}

33
app/api/controller/JunziqianController.php
View File

@ -199,7 +199,8 @@ class JunziqianController extends BaseApiController
return $response;
}
public function downloadVehicleContractFile($applyNo) {
public function downloadVehicleContractFile($applyNo)
{
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$contract_url = VehicleContract::where('contract_no', $applyNo)->value('contract_url');
if ($contract_url && !empty($contract_url)) {
@ -218,7 +219,8 @@ class JunziqianController extends BaseApiController
}
}
public function downloadVehicleContractEvidence($applyNo,$companyName,$companyCode) {
public function downloadVehicleContractEvidence($applyNo, $companyName, $companyCode)
{
//构建请求工具
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
//初始化合同参数
@ -284,6 +286,9 @@ class JunziqianController extends BaseApiController
return $response;
}
/**
* 下载合同
*/
public function download_file($applyNo)
{
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
@ -304,6 +309,30 @@ class JunziqianController extends BaseApiController
return $this->fail('获取失败');
}
}
/**
* 保全后合同文件及证据包下载
*/
public function EvidenceDownload($param)
{
//初始化请求参数
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$request = array(
"applyNo" => $param['applyNo'],
"fullName" => $param['fullName'],
"identityCard" => $param['identityCard'],
"identityType" => 12,
"dealType" => 1,
);
$response = $requestUtils->doPost("/v2/sign/presLinkFile", $request);
if ($response->success == true) {
$this->getDownload($response->data, root_path() . 'public/uploads/evidence/' . $param['applyNo'] . '.zip');
Db::name('contract')->where('contract_no', $param['applyNo'])->update(['contract_url' => '/uploads/evidence/' . $param['applyNo'] . '.pdf']);
return $this->success('获取成功', ['url' => env('url.url_prefix') . '/uploads/evidence/' . $param['applyNo'] . '.zip']);
} else {
return $this->fail('获取失败');
}
}
public function getDownload($url, $publicDir = '', $fileName = '', $type = 0)
{

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

@ -18,6 +18,7 @@ class TaskController extends BaseApiController
{
$param = Request()->param();
[$page, $limit] = $this->getPage();
$time = strtotime(date('Y-m-d'));
if ($this->userInfo['admin_id'] != 0) {
$where[] = ['company_id', '=', $this->userInfo['company_id']];
} else {

32
app/job/TaskInformationJob.php
View File

@ -51,25 +51,19 @@ class TaskInformationJob
return false;
}
$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=bcadd($transaction_pool,$day_money,2);
}else{
$shang_date_total_price['arr']['supplement']=0;
$shang_date_total_price['arr']['after_transaction_pool']=0;
$day_money=0;
$transaction_pool=bcadd($transaction_pool,$shang_date_total_price['arr']['total_price'],2);
$transaction_pool=bcsub($transaction_pool,$shang_date_total_price['arr']['day_money'],2);
if($transaction_pool<0){
$transaction_pool=0;
}
}
$shang_date_total_price['arr']['before_transaction_pool']=$day_money;
Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>$transaction_pool]);
$count_money=bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2);
if($count_money>$shang_date_total_price['arr']['day_money']){
$day_money=bcsub($count_money,$shang_date_total_price['arr']['day_money'],2);//当计算剩余池before_transaction_pool
$shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool;//变化前
$shang_date_total_price['arr']['after_transaction_pool']=$day_money;//变化后
Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode(['transaction'=>$shang_date_total_price])]);
TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>$day_money]);
$shang_date_total_price['arr']['status']=1;
}else{
Log::info('交易金额任务，交易金额小于今日金额：' . json_encode($data));
Task::where('id', $data['task_id'])->update(['status' => 5]);
return false;
}
$name = $shang_date_total_price['name'];
$arr['status'] = $shang_date_total_price['arr']['status'];
@ -100,7 +94,7 @@ class TaskInformationJob
$arr['company_account_type'] = 2;
}else{
if($data['template_info']['day_count']<=$day){
TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 0]);
try{
Task::where('id', $data['task_id'])->update(['create_time' => $task_35['start_time']+86400,'update_time' =>time(),'start_time'=>$task_35['start_time']+86400,'end_time'=>$task_35['start_time']+86400+86399]);
}catch(\Exception $e){