修复收款账户协议签署主体识别

账户持有人姓名仅用于协议正文,账户类协议始终由快递企业签署,并要求填写匹配 E 签宝账号的实名经办人。
This commit is contained in:
limeng 2026-09-18 18:31:12 +08:00
parent 760d6ec79a
commit 62804da45a
5 changed files with 91 additions and 24 deletions

View File

@ -91,7 +91,7 @@ class CourierAgreementSignatures extends Controller
// signing_subject identifies our initiating company. The E-sign
// organization must be the counterparty that receives this request.
$data['organization_name'] = $this->counterpartyOrganizationName($data);
$data['operator_name'] = $data['operator_name'] ?? $data['courier_name'];
$data['operator_name'] = trim((string) ($data['operator_name'] ?? '')) ?: null;
$data['operator_account'] = $data['esign_account'];
$data['payload'] = $this->payload($data);
@ -281,7 +281,7 @@ class CourierAgreementSignatures extends Controller
'signing_deadline' => $date,
'esign_account' => ['required', 'string', 'max:255'],
'secondary_esign_account' => ['required_if:document_type,entity-change,cooperation-contract,authorization', 'nullable', 'string', 'max:255'],
'operator_name' => ['nullable', 'string', 'max:100'],
'operator_name' => ['required_if:document_type,account-proof,account-change', 'nullable', 'string', 'min:2', 'max:100'],
'archive_mode' => ['required', 'in:auto,manual'],
'account_proof_effective_date' => ['required_if:document_type,account-proof', 'date'],
'account_proof_account_name' => ['required_if:document_type,account-proof', 'string', 'max:255'],
@ -370,8 +370,7 @@ class CourierAgreementSignatures extends Controller
private function counterpartyOrganizationName(array $data): string
{
return match ($data['document_type']) {
'account-proof' => trim((string) $data['account_proof_account_name']),
'account-change' => trim((string) $data['new_account_name']),
'account-proof', 'account-change' => trim((string) $data['courier_name']),
'shared-contract' => trim((string) (($data['shared_courier_names'][0] ?? null) ?: ($data['shared_courier_name'] ?? $data['courier_name']))),
'entity-change' => trim((string) ($data['former_company_name'] ?? $data['courier_name'])),
'authorization' => trim((string) ($data['principal_name'] ?? $data['courier_name'])),

View File

@ -285,15 +285,10 @@ final class CourierAgreementSignatureService
$payload = $signature->payload ?? [];
if (in_array($signature->document_type, ['account-proof', 'account-change'], true)) {
$name = $signature->organization_name;
$isOrganization = $this->looksLikeOrganization($name);
return [[
'signer_type' => $isOrganization ? 1 : 0,
'organization_name' => $isOrganization ? $name : null,
'operator_name' => $isOrganization
? ($signature->operator_name ?: $signature->courier_name)
: $name,
'signer_type' => 1,
'organization_name' => $signature->organization_name,
'operator_name' => $signature->operator_name,
'operator_account' => $signature->operator_account,
]];
}
@ -352,11 +347,6 @@ final class CourierAgreementSignatureService
return [$primary];
}
private function looksLikeOrganization(string $name): bool
{
return preg_match('/公司|有限公司|有限责任|企业|集团|合作社|事务所|中心|厂/u', $name) === 1;
}
private function safeTitle(string $title): string
{
$title = preg_replace('/[^\p{Han}\p{L}\p{N}_ -]/u', '-', $title) ?: '协议签署';

View File

@ -1400,8 +1400,9 @@
<p class="agreement-help">选择快递公司后自动带出工作平台的“电子签章经办人”(dzqzjbr);如资料未维护,可手工填写对方在 E 签宝实名绑定的手机号或邮箱。</p>
</div>
<div class="agreement-field">
<label for="agreement-operator-name">对方签署人姓名</label>
<input class="agreement-control" id="agreement-operator-name" name="operator_name" type="text" placeholder="可选,默认使用对方签署主体名称" autocomplete="name">
<label for="agreement-operator-name">对方 E 签宝实名认证姓名 <span class="agreement-required" data-account-operator-required aria-hidden="true">*</span></label>
<input class="agreement-control" id="agreement-operator-name" name="operator_name" type="text" placeholder="填写与 E 签宝账号匹配的实名姓名" autocomplete="name" data-account-operator-name required>
<p class="agreement-help">仅用于 E 签宝身份核验,不是收款人姓名;收款人姓名请填写在下方账户资料中。</p>
</div>
<div class="agreement-field" data-quote-confirmation-field hidden>
<label for="agreement-quote-version">报价版本 <span class="agreement-required" aria-hidden="true">*</span></label>
@ -1880,6 +1881,8 @@
var subjectCodeInput = root.querySelector('[data-subject-code]');
var courierSelect = root.querySelector('[data-courier-select]');
var esignAccountInput = root.querySelector('input[name="esign_account"]');
var operatorNameInput = root.querySelector('[data-account-operator-name]');
var operatorRequiredMark = root.querySelector('[data-account-operator-required]');
var sharedCourierList = root.querySelector('[data-shared-courier-list]');
var sharedCourierAdd = root.querySelector('[data-shared-courier-add]');
var quoteVersionField = root.querySelector('[data-quote-confirmation-field]');
@ -2370,6 +2373,13 @@
var templateType = documentOption.value;
var courier = fieldValue('[name="courier_name"]', '快递公司');
var companyName = fieldValue('[name="company_full_name"]', '待填写公司全称');
var accountOperatorRequired = templateType === 'account-proof' || templateType === 'account-change';
if (operatorNameInput) {
operatorNameInput.required = accountOperatorRequired;
}
if (operatorRequiredMark) {
operatorRequiredMark.hidden = !accountOperatorRequired;
}
activateTemplate(templateType);
var secondary = root.querySelector('[data-secondary-signer-fields]');
if (secondary) {

View File

@ -68,6 +68,8 @@ class AgreementSigningPageTest extends FeatureTestCase
->assertSee('data-subject-linked-name', false)
->assertSeeText('签署截止日期')
->assertSeeText('对方E签宝账号')
->assertSeeText('对方 E 签宝实名认证姓名')
->assertSeeText('仅用于 E 签宝身份核验,不是收款人姓名')
->assertSeeText('合作合同统一使用我方账号 18052733960')
->assertSeeText('填写变量')
->assertSeeText('签署完成后自动归档')

View File

@ -48,7 +48,7 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
$this->assertSame('TPL-ACCOUNT-CERT-V2', $signature->template_code);
$this->assertSame(CourierAgreementSignature::STATUS_SIGNING, $signature->status);
$this->assertSame('flow-agreement-001', $signature->esign_sign_flow_id);
$this->assertSame('新北中通快递有限公司', $signature->organization_name);
$this->assertSame('新北中通', $signature->organization_name);
Storage::disk('uploads')->assertExists($signature->source_pdf_path);
$this->assertSame('新北中通快递有限公司', $signature->payload['account_proof_account_name']);
@ -58,7 +58,7 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
}
return data_get($request->data(), 'signers.0.signerType') === 1
&& data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '新北中通快递有限公司'
&& data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '新北中通'
&& data_get($request->data(), 'signers.0.orgSignerInfo.transactorInfo.psnInfo.psnName') === '张经理';
});
@ -86,12 +86,55 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
return false;
}
return data_get($request->data(), 'signers.0.signerType') === 0
&& data_get($request->data(), 'signers.0.psnSignerInfo.psnInfo.psnName') === '李四'
&& data_get($request->data(), 'signers.0.orgSignerInfo') === null;
return data_get($request->data(), 'signers.0.signerType') === 1
&& data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '新北中通'
&& data_get($request->data(), 'signers.0.orgSignerInfo.transactorInfo.psnInfo.psnName') === '张经理'
&& data_get($request->data(), 'signers.0.psnSignerInfo') === null;
});
}
public function test_account_change_keeps_courier_company_signer_when_payee_changes(): void
{
$this->fakeEsign();
$payload = $this->accountChangePayload('request-account-change');
$payload['new_account_name'] = '李四';
$this->loginAs()
->post(route('business.courier-agreement-signatures.store'), $payload)
->assertRedirect();
$signature = CourierAgreementSignature::query()->firstOrFail();
$this->assertSame('新北中通', $signature->organization_name);
$this->assertSame('李四', $signature->payload['new_account_name']);
$this->assertSame('张经理', $signature->operator_name);
Http::assertSent(function (ClientRequest $request): bool {
if ($request->url() !== 'https://smlopenapi.esign.test/v3/sign-flow/create-by-file') {
return false;
}
return data_get($request->data(), 'signers.0.signerType') === 1
&& data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '新北中通'
&& data_get($request->data(), 'signers.0.orgSignerInfo.transactorInfo.psnInfo.psnName') === '张经理'
&& data_get($request->data(), 'signers.0.psnSignerInfo') === null;
});
}
public function test_account_proof_requires_esign_real_name_separate_from_payee_name(): void
{
$this->fakeEsign();
$payload = $this->accountProofPayload('request-missing-operator-name');
unset($payload['operator_name']);
$this->withExceptionHandling()
->loginAs()
->post(route('business.courier-agreement-signatures.store'), $payload)
->assertSessionHasErrors('operator_name');
$this->assertDatabaseCount('business_courier_agreement_signatures', 0);
Http::assertNothingSent();
}
public function test_cooperation_contract_maps_party_variables_and_creates_two_signers(): void
{
$this->fakeEsign();
@ -552,6 +595,29 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
];
}
private function accountChangePayload(string $idempotencyKey): array
{
return [
'idempotency_key' => $idempotencyKey,
'courier_name' => '新北中通',
'document_type' => 'account-change',
'signing_subject' => $this->company->name,
'company_full_name' => $this->company->name,
'signing_deadline' => now()->addDays(7)->toDateString(),
'esign_account' => '13800138000',
'operator_name' => '张经理',
'archive_mode' => 'auto',
'account_change_date' => now()->toDateString(),
'old_account_name' => '新北中通快递有限公司',
'old_account_number' => '6222000012345678',
'old_account_stop_date' => now()->toDateString(),
'new_account_effective_date' => now()->addDay()->toDateString(),
'new_account_name' => '新北中通快递有限公司',
'new_bank_name' => '中国工商银行',
'new_bank_account' => '6222000098765432',
];
}
private function agreementSignature(array $attributes = []): CourierAgreementSignature
{
return CourierAgreementSignature::create(array_merge([