From 18d8f28a905dbc1641d4da239d853439c064a6de Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 8 Sep 2023 21:28:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/job/TaskInformatio?= =?UTF-8?q?nJob.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 --- app/job/TaskInformationJob.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index ca82d7cb7..8d30057c3 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -55,14 +55,20 @@ class TaskInformationJob 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'=>bcadd($transaction_pool,$day_money,2)]); + TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>$transaction_pool]); $shang_date_total_price['arr']['status']=1; } $name = $shang_date_total_price['name']; @@ -94,7 +100,14 @@ class TaskInformationJob $arr['company_account_type'] = 2; }else{ if($data['template_info']['day_count']<=$day){ - 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'=> strtotime($task_35['end_time']) + 86400]); + + 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){ + $start_time = strtotime(date('Y-m-d')); + Task::where('id', $data['task_id'])->update(['create_time' => $start_time+86400,'update_time' =>time(),'start_time'=>$start_time+86400,'end_time'=> $start_time + 86400+86399]); + + } return false; } if($data['template_info']['day_count']>$day){ From 7e4931803e3879cc43665cb8f81d8c1cbabd2d35 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 8 Sep 2023 21:29:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/controller/Tas?= =?UTF-8?q?kController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补丁 --- app/api/controller/TaskController.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 1178731e8..dc0a9ecf0 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -45,7 +45,6 @@ class TaskController extends BaseApiController $param['end_time']=date('Y-m-d H:i:s',$end); $where[] = ['start_time', 'between', [$time, $end]]; } - } if (isset($param['status']) && $param['status'] > 0) { $where[] = ['status', '=', $param['status']]; @@ -58,16 +57,18 @@ class TaskController extends BaseApiController foreach ($res as $k => $item) { if ($item['type'] == 33) { $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足 - $find = App(RemoteController::class)->shang_date_total_price($company,1,$param,$item['template_id']); + $find = App(RemoteController::class)->shang_date_total_price($company,$param,$item['template_id']); if ($find != false) { - $transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool'); - if($transaction_pool==0){ - $find['transaction_pool']=0; - }else{ - $find['transaction_pool']=$transaction_pool; + if($timevalue('transaction_pool'); + if($transaction_pool==0){ + $find['transaction_pool']=0; + }else{ + $find['transaction_pool']=$transaction_pool; + } + $res[$k]['extend']['transaction'] = $find; } - $res[$k]['extend']['transaction'] = $find; - Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]); + // Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]); } else { $res[$k]['extend']['transaction'] = ''; } From 00d399875054eb2dc64980db20a9d0814be03751 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 8 Sep 2023 21:30:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/lists/AccountL?= =?UTF-8?q?ogLists.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补丁 --- app/api/lists/AccountLogLists.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/api/lists/AccountLogLists.php b/app/api/lists/AccountLogLists.php index 79d38df8c..bb83cd223 100755 --- a/app/api/lists/AccountLogLists.php +++ b/app/api/lists/AccountLogLists.php @@ -16,14 +16,16 @@ namespace app\api\lists; use app\common\enum\user\AccountLogEnum; use app\common\model\user\UserAccountLog; - +use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Sum; +use app\common\lists\ListsExtendInterface; +use app\common\lists\ListsSearchInterface; /** * 账户流水列表 * Class AccountLogLists * @package app\shopapi\lists */ -class AccountLogLists extends BaseApiDataLists +class AccountLogLists extends BaseApiDataLists implements ListsExtendInterface { /** @@ -79,16 +81,20 @@ class AccountLogLists extends BaseApiDataLists ->limit($this->limitOffset, $this->limitLength) ->select() ->toArray(); - foreach ($lists as &$item) { $item['type_desc'] = AccountLogEnum::getChangeTypeDesc($item['change_type']); $symbol = $item['action'] == AccountLogEnum::DEC ? '-' : '+'; $item['change_amount_desc'] = $symbol . $item['change_amount']; } - return $lists; } + public function extend(){ + $deposit=UserAccountLog::where($this->queryWhere())->where('change_type',203)->sum('change_amount'); + $user_money=UserAccountLog::where($this->queryWhere())->where('change_type',202)->sum('change_amount'); + return ['deposit'=>$deposit,'user_money'=>$user_money]; + + } /** * @notes 获取数量 From 217ec57a73bc0fbc3fbd8b8fadc962e908d506f6 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 8 Sep 2023 21:31:55 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/controller/Rem?= =?UTF-8?q?oteController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补丁 --- app/api/controller/RemoteController.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php index d2b147962..cb3e5f9f3 100644 --- a/app/api/controller/RemoteController.php +++ b/app/api/controller/RemoteController.php @@ -12,17 +12,12 @@ class RemoteController extends BaseApiController public array $notNeedLogin = ['index']; - public function shang_date_total_price($company,$isDay=1,$arr=[],$template_id=0) + public function shang_date_total_price($company,$arr=[],$template_id=0) { - if($isDay==1){ - $start_time = date('Y-m-d'); - $time=strtotime($start_time)+86399; - $end_time=date('Y-m-d H:i:s',$time); - }else{ - $start_time = date('Y-m-d',strtotime('-1 day', time())); - $time=strtotime($start_time)+86399; - $end_time=date('Y-m-d H:i:s',$time); - } + $start_time = date('Y-m-d'); + $time=strtotime($start_time)+86399; + $end_time=date('Y-m-d H:i:s',$time); + if(isset($arr['start_time']) && $arr['end_time']){ $start_time = $arr['start_time']; $end_time = $arr['end_time']; From 5909269f33270b4be0f9611e0a32857923ed8421 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 8 Sep 2023 22:54:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/api/controller/Tas?= =?UTF-8?q?kController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复错误 --- app/api/controller/TaskController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index dc0a9ecf0..a3ed2ffb6 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -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 { From 4532cfabcf232eb64c6b9e04ead5b6d0389c4b36 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 9 Sep 2023 09:46:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/TaskInformationJob.php | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index 8d30057c3..12508c0d3 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -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){ From 26183f80f8de9310747831d81eef6c9f2552c7b5 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 9 Sep 2023 11:42:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/ContractController.php | 89 ++++++++++-------- app/api/controller/JunziqianController.php | 93 ++++++++++++------- 2 files changed, 112 insertions(+), 70 deletions(-) diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php index dd4ec7e8d..2d33b86f1 100644 --- a/app/adminapi/controller/contract/ContractController.php +++ b/app/adminapi/controller/contract/ContractController.php @@ -114,14 +114,14 @@ class ContractController extends BaseAdminController { $params = Request::param(); $file = $params['file']; - $res = Contract::where('id', $params['id'])->update(['file' => $file,'check_status'=>2]); + $res = Contract::where('id', $params['id'])->update(['file' => $file, 'check_status' => 2]); if ($res) { - $find=Contract::where('id', $params['id'])->with(['party_a_info'])->field('type,party_b,party_a') - ->find()->toArray(); - if($find['type']==1){ - $find['party_b_info'] =Company::where('id', $find['party_b'])->field('company_name name,master_phone phone')->find()->toArray(); - }else{ - $find['party_b_info'] =User::where('id', $find['party_b'])->field('nickname name,mobile phone')->find()->toArray(); + $find = Contract::where('id', $params['id'])->with(['party_a_info'])->field('type,party_b,party_a') + ->find()->toArray(); + if ($find['type'] == 1) { + $find['party_b_info'] = Company::where('id', $find['party_b'])->field('company_name name,master_phone phone')->find()->toArray(); + } else { + $find['party_b_info'] = User::where('id', $find['party_b'])->field('nickname name,mobile phone')->find()->toArray(); } $a = [ 'mobile' => $find['party_a_info']['master_phone'], @@ -137,45 +137,58 @@ class ContractController extends BaseAdminController SmsLogic::contractUrl($b); return $this->success('上传成功', [], 1, 1); } else { - if($res==0){ + if ($res == 0) { return $this->success('没有更新', [], 1, 1); } return $this->fail('上传失败'); } } - //**发送短信 */ 接口可能要做调整 - - public function postsms() - { - $params = Request::param(); - $find = Db::name('contract')->where('id', $params['id']) - ->withAttr('contract_type_name', function ($value, $data) { - return Db::name('dict_data')->where('id', $data['contract_type'])->value('name'); - }) - ->withAttr('user_info', function ($value, $data) { - if($data['type']==1){ - return Db::name('admin')->where('id', $data['party_b'])->field('name,phone')->find(); - }else{ - return Db::name('user')->where('id', $data['party_b'])->field('nickname name,mobile phone')->find(); - } - }) - ->find(); - if ($find && $find['url'] != '') { - //发送短信 - $sms = [ - 'mobile' => $find['user_info']['phone'], - 'name' => $find['user_info']['name'], - 'type' => '《' . $find['contract_type_name'] . '》', - 'code' => 'api/Hetong/url?id=' . $find['id'], - 'scene' => 'WQ' - ]; - $result = SmsLogic::contractUrl($sms); - if (true === $result) { - return $this->success('发送成功'); + //**发送短信 */ 接口可能要做调整 + + public function postsms() + { + $params = Request::param(); + $find = Db::name('contract')->where('id', $params['id']) + ->withAttr('contract_type_name', function ($value, $data) { + return Db::name('dict_data')->where('id', $data['contract_type'])->value('name'); + }) + ->withAttr('user_info', function ($value, $data) { + if ($data['type'] == 1) { + return Db::name('admin')->where('id', $data['party_b'])->field('name,phone')->find(); } else { - return $this->fail(SmsLogic::getError()); + return Db::name('user')->where('id', $data['party_b'])->field('nickname name,mobile phone')->find(); } + }) + ->find(); + if ($find && $find['url'] != '') { + //发送短信 + $sms = [ + 'mobile' => $find['user_info']['phone'], + 'name' => $find['user_info']['name'], + 'type' => '《' . $find['contract_type_name'] . '》', + 'code' => 'api/Hetong/url?id=' . $find['id'], + 'scene' => 'WQ' + ]; + $result = SmsLogic::contractUrl($sms); + if (true === $result) { + return $this->success('发送成功'); + } else { + return $this->fail(SmsLogic::getError()); } } + } + + 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); + } } diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index cb5c2b614..f030e131d 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -77,14 +77,14 @@ class JunziqianController extends BaseApiController $request->organizationRegNo = $data['organization_code']; $request->organizationRegImg = $data['business_license']; //new CURLFile('D:/tmp/test.png',null,"test.png"); $request->legalName = $data["master_name"]; //法人 -// $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要 -// $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要 + // $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要 + // $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 签约时短信验证需要 if (isset($data['master_email'])) { $request->emailOrMobile = $data['master_email']; //邮箱 } // $request->notifyUrl = env('url.url_prefix').'/notifyAuthentication?ids=22222'; - $request->notifyUrl = env('url.url_prefix').'/notifyAuthentication?id='.$data['id']; + $request->notifyUrl = env('url.url_prefix') . '/notifyAuthentication?id=' . $data['id']; // halt($request); //发起创建企业请求 $response = $requestUtils->doPost("/v2/user/organizationCreate", $request); @@ -102,8 +102,8 @@ class JunziqianController extends BaseApiController $request->organizationRegNo = $data['organization_code']; $request->organizationRegImg = $data['business_license']; //new CURLFile('D:/tmp/test.png',null,"test.png"); $request->legalName = $data["master_name"]; //法人 -// $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要 -// $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 短信验证需要 + // $request->legalIdentityCard = $data["master_id_card"]; // 法人身份证 签约时人脸识别需要 + // $request->legalMobile = $data["master_phone"]; // 法人手机号 预留 短信验证需要 $request->emailOrMobile = $data['master_email']; //邮箱 //发起创建企业请求 $response = $requestUtils->doPost("/v2/user/organizationReapply", $request); @@ -141,18 +141,18 @@ class JunziqianController extends BaseApiController //签约 public function Signing($data, $id, $notify = '') { - if($notify==''){ - $notify=env('url.url_prefix').'/notify_url'; + if ($notify == '') { + $notify = env('url.url_prefix') . '/notify_url'; } $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); $request = new ApplySignReq(); $request->contractName = $data['name']; $request->signatories = $data['signatories']; //签约方 -// $request->faceThreshold = 79; // 人脸识别阀值:默认等级(1-100之间整数)，建议范围(60-79) + // $request->faceThreshold = 79; // 人脸识别阀值:默认等级(1-100之间整数)，建议范围(60-79) $request->serverCa = 1; //是否需要服务端云证书 $request->fileType = 1; //合同上传方式 url $request->url = $data['url']; - $request->notifyUrl = $notify.'?id='.$id; + $request->notifyUrl = $notify . '?id=' . $id; $request->needQifengSign = 1; //发起PING请求 // halt($request); @@ -164,19 +164,19 @@ class JunziqianController extends BaseApiController public function OrganizationFaceCreate($data) { $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); - $request=new OrganizationCreateReq(); - $request-> orderNo = $data['id']; - $request-> email = $data['master_email']; - $request-> enterpriseName = $data['company_name']; - $request-> identityNo = $data['organization_code']; -// $request-> facePerType = 0; - $request-> legalPersonName = $data['master_name']; - $request-> legalIdentityCard = $data['master_id_card'];//法人证件号 - $request-> legalMobile = $data['master_phone']; - $request-> faceAgantIdenName = $data['master_name']; - $request-> faceAgantIdenCard = $data['master_id_card']; - $request-> backUrl = env('url.url_prefix').'/api/Hetong/notifyOrganizationFaceCreate'; - $response = $requestUtils->doPost("/v2/user/organizationFaceCreate",$request); + $request = new OrganizationCreateReq(); + $request->orderNo = $data['id']; + $request->email = $data['master_email']; + $request->enterpriseName = $data['company_name']; + $request->identityNo = $data['organization_code']; + // $request-> facePerType = 0; + $request->legalPersonName = $data['master_name']; + $request->legalIdentityCard = $data['master_id_card']; //法人证件号 + $request->legalMobile = $data['master_phone']; + $request->faceAgantIdenName = $data['master_name']; + $request->faceAgantIdenCard = $data['master_id_card']; + $request->backUrl = env('url.url_prefix') . '/api/Hetong/notifyOrganizationFaceCreate'; + $response = $requestUtils->doPost("/v2/user/organizationFaceCreate", $request); return $response; } @@ -189,7 +189,7 @@ class JunziqianController extends BaseApiController $request->serverCa = 1; //是否需要服务端云证书 $request->fileType = 1; //合同上传方式 url $request->url = $data['url']; - $request->notifyUrl = $notify.'?id='.$id; + $request->notifyUrl = $notify . '?id=' . $id; $request->needQifengSign = 1; //发起PING请求 @@ -198,7 +198,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)) { @@ -211,28 +212,29 @@ class JunziqianController extends BaseApiController $response = $requestUtils->doPost("/v2/sign/linkFile", $request); if ($response->success) { $this->getDownload($response->data, root_path() . 'public/uploads/vehicle_contract/' . $applyNo . '.pdf'); - return env('project.website_domain').'/uploads/vehicle_contract/' . $applyNo . '.pdf'; + return env('project.website_domain') . '/uploads/vehicle_contract/' . $applyNo . '.pdf'; } else { return false; } } - public function downloadVehicleContractEvidence($applyNo,$companyName,$companyCode) { + public function downloadVehicleContractEvidence($applyNo, $companyName, $companyCode) + { //构建请求工具 - $requestUtils=new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); + $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); //初始化合同参数 - $request=array( + $request = array( "applyNo" => $applyNo, "fullName" => $companyName, //签约人名称（合同发起接口中传入的签署人姓名） "identityCard" => $companyCode, //统一社会信用代码 "identityType" => 12, //证件类型 1身份证, 2护照, 3台胞证, 4港澳居民来往内地通行证, 11营业执照, 12统一社会信用代码, 20子账号, 99其他 "evidenceType" => 0 //证据类型,0图片,1视频,2人脸证据 ); - $response = $requestUtils->doPost("/v2/sign/evidenceLinkFile",$request); + $response = $requestUtils->doPost("/v2/sign/evidenceLinkFile", $request); if ($response->success) { $resData = (array)$response->data; $this->getDownload($resData['link'], root_path() . 'public/uploads/vehicle_contract/' . $applyNo . '.png'); - return env('project.website_domain').'/uploads/vehicle_contract/' . $applyNo . '.png'; + return env('project.website_domain') . '/uploads/vehicle_contract/' . $applyNo . '.png'; } else { return false; } @@ -275,7 +277,7 @@ class JunziqianController extends BaseApiController $request->serverCa = 1; //是否需要服务端云证书 $request->fileType = 3; $request->htmlContent = $data['content']; - $request->notifyUrl = env('url.url_prefix').'/notify_url?id=' . $id; + $request->notifyUrl = env('url.url_prefix') . '/notify_url?id=' . $id; $request->needQifengSign = 1; //发起PING请求 @@ -283,6 +285,9 @@ class JunziqianController extends BaseApiController return $response; } + /** + * 下载合同 + */ public function download_file($applyNo) { $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); @@ -298,7 +303,31 @@ class JunziqianController extends BaseApiController if ($response->success == true) { $this->getDownload($response->data, root_path() . 'public/uploads/contract/' . $applyNo . '.pdf'); Db::name('contract')->where('contract_no', $applyNo)->update(['contract_url' => '/uploads/contract/' . $applyNo . '.pdf']); - return $this->success('获取成功', ['url' => env('url.url_prefix').'/uploads/contract/' . $applyNo . '.pdf']); + return $this->success('获取成功', ['url' => env('url.url_prefix') . '/uploads/contract/' . $applyNo . '.pdf']); + } else { + 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('获取失败'); }