limeng
71652c5a64
快递应付 → 快递报价 下新增「快递入驻」页：生成入驻二维码发给快递方，
对方免登录在手机上填写主体、联系人、e签宝签署人、结算账户、报价并上传资质，
内部对接人初审、管理员财务复审后生成首版报价，并自动生成报价确认单 PDF
推送到快递填写的 e签宝账号，签署归档后开通。
- 新增三张表 business_courier_onboardings / _files / _events（纯新增，不改旧表）
- 免登录填报页 /onboarding/courier/{token}：40 位随机 token，可暂存、提交、退回后补件，
链接有效期可延长、可作废；银行账号加密存储；附件存 uploads 盘
- 新增 COURIER_ONBOARDING_PUBLIC_URL 配置二维码里的站点地址（留空用当前访问地址）
- 内置纯 PHP 二维码生成（App\Support\QrCode，SVG 输出，无新增依赖）
- 生成二维码时必须定好系统快递名称（唯一，快递方不可见）；财务复审沿用该名称，快递所填报价写成报价管理的 CourierQuoteVersion，
复用 CourierQuoteSignatureService 生成报价确认单并推送 e签宝（失败可重推/同步状态）；初审人默认不能复审（COURIER_ONBOARDING_ALLOW_SAME_REVIEWER=true 可在测试环境放开）
- 支持公司 / 个人两种入驻：个人填姓名+身份证号（加密）、传身份证和银行卡，报价确认单按个人身份在 e签宝签署
- 扫码先选入驻方式；证件改为 营业执照 / 法人身份证正反面 / 银行卡正反面 各一张（个人营业执照选填），手机端上传前自动压缩，超限回到填报页提示
- 报价支持 4 种计费方式（面单+费率 / 首重+续重 / 按重量段一口价 / 小重量一口价+超出另算，费率可分段）+「其他」上传报价表；附加规则：计泡、起算重量、取整、每票加收（CourierQuoteStructure）
- 不再要求上传盖章报价单，至少填写一行在线报价
- 开通：报价确认单签署归档、或匹配到已签署协议、或填写线下签署说明
- 生成二维码前必填「快递公司代码」（自动大写、不可重复），入驻信息按代码对齐快递资料
- 公司入驻对公（营业执照主体）+ 对私（法定代表人）两个打款账户必填并自动核对；个人入驻对私必填、对公选填
- 变价：报价管理里后台改价 → 审核 → 自动推送快递 e签宝 → 回签；回签单导出 xlsx/zip；误发版本可作废
- 短期（临时）变价：变价单/报价版本加选填「结束日期」（end_date）；按日期取价，期间用临时价，到期次日自动恢复原长期报价，
不用重签；报价管理显示 生效中（临时）/ 暂停中 / 已到期，确认单写明执行期间和到期后恢复的版本，审核提醒期间重叠
- 快递资料分四类：快递资料 / 网点 / 打款信息 / 操作日志，支持查询、导出、重置、编辑；
财务系统入驻的快递直接作为快递资料行，合同起止取协议签署里已签署的合作合同；
点开一行在下方看该快递的网点 / 打款信息（完整账号）/ 操作日志
- 编辑存财务系统覆盖值（business_courier_profiles，不回写工作平台），改动记操作日志（business_courier_profile_events）
- 打款信息新增 / 变更（business_courier_payment_accounts，账号加密）保存后跳到协议签署，自动预填收款账户证明 / 收款账户变更，
按签署状态显示 待推送协议 / 签署中 / 已生效；入口在快递资料明细和「打款信息」页签（表格每个账户可直接「变更」）
- ERP 开通：入驻开通后标「待 ERP 开通」，可手动补录（钉钉「新建快递」流程同步待接入）
- 新增 CourierOnboardingWorkflowTest（8 个用例），更新快递报价目录顺序断言
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019gzfsnV3fJ89CoUy1D9V9g
319 lines
14 KiB
PHP
319 lines
14 KiB
PHP
<?php
|
||
|
||
namespace App\Http\Controllers\Business;
|
||
|
||
use App\Models\Business\CourierQuoteChange;
|
||
use App\Services\Esign\EsignClient;
|
||
use App\Support\CourierQuoteChangeService;
|
||
use App\Support\CourierOnboardingService;
|
||
use App\Support\CourierQuoteSignatureService;
|
||
use App\Support\CourierRequoteService;
|
||
use App\Support\QuoteManagementSnapshot;
|
||
use App\Utilities\SystemAccess;
|
||
use Illuminate\Http\RedirectResponse;
|
||
use Illuminate\Http\Request;
|
||
use Illuminate\Routing\Controller;
|
||
use Illuminate\View\View;
|
||
|
||
class CourierQuoteChanges extends Controller
|
||
{
|
||
public function __construct(
|
||
private readonly CourierQuoteChangeService $service,
|
||
private readonly QuoteManagementSnapshot $snapshot,
|
||
private readonly CourierQuoteSignatureService $signatureService,
|
||
private readonly CourierRequoteService $requotes,
|
||
) {
|
||
}
|
||
|
||
public function index(): View
|
||
{
|
||
$changes = CourierQuoteChange::query()
|
||
->with(['items', 'version'])
|
||
->latest('updated_at')
|
||
->paginate(20);
|
||
|
||
return view('business.pages.courier-payables.quote-change-history', [
|
||
'changes' => $changes,
|
||
'canReview' => $this->canReview(),
|
||
]);
|
||
}
|
||
|
||
public function create(Request $request): View|RedirectResponse
|
||
{
|
||
$quotes = $this->snapshot->load()['quotes'] ?? [];
|
||
abort_if($quotes === [], 422, '尚未导入可用于变更的报价版本。');
|
||
|
||
$selectedId = (string) $request->query('source_quote_id', $quotes[0]['id']);
|
||
$source = $this->service->findSourceQuote($selectedId);
|
||
|
||
// 已入驻快递的报价走后台变价页（可改价格，也可改计费方式），推送按入驻资料签署。
|
||
if ($request->has('source_quote_id') && ($onboarding = $this->requotes->onboardingForCourier($source['company_name'] ?? null))) {
|
||
return redirect()->route('business.courier-onboardings.requote', $onboarding);
|
||
}
|
||
|
||
return view('business.pages.courier-payables.quote-change-editor', $this->editorData(null, $quotes, $source));
|
||
}
|
||
|
||
public function store(Request $request): RedirectResponse
|
||
{
|
||
$change = $this->service->create($this->validatedChange($request, true), user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.edit', $change)
|
||
->with('success', "已保存变更草稿 {$change->number}。原始报价未被修改。");
|
||
}
|
||
|
||
public function show(CourierQuoteChange $quoteChange): View
|
||
{
|
||
$this->refreshSignatures();
|
||
$quoteChange->load(['items', 'events.actor', 'version.signature']);
|
||
$onboarding = $quoteChange->hasQuotePayload() ? $this->requotes->onboardingForCourier($quoteChange->carrier_name) : null;
|
||
$requoteDiff = $onboarding !== null
|
||
? $this->requotes->diff($onboarding, $this->requotes->basePayload($onboarding, $quoteChange), $quoteChange->quote_payload)
|
||
: null;
|
||
|
||
return view('business.pages.courier-payables.quote-change-show', [
|
||
'change' => $quoteChange,
|
||
'onboarding' => $onboarding,
|
||
'requoteDiff' => $requoteDiff,
|
||
'reviewWarnings' => $quoteChange->hasQuotePayload() && $quoteChange->status !== CourierQuoteChange::STATUS_APPROVED
|
||
? $this->requotes->reviewWarnings($quoteChange, $requoteDiff)
|
||
: [],
|
||
'voidedBy' => $quoteChange->version?->voided_by ? user_model_class()::query()->find($quoteChange->version->voided_by)?->name : null,
|
||
'canReview' => $this->canReview() && ($quoteChange->created_by !== user_id() || config('courier_onboarding.allow_same_reviewer')),
|
||
'canManageSignature' => $this->canReview(),
|
||
'esignConfigured' => EsignClient::configured(),
|
||
'esignEnvironment' => (string) config('services.esign.environment', 'sandbox'),
|
||
]);
|
||
}
|
||
|
||
public function edit(CourierQuoteChange $quoteChange): View|RedirectResponse
|
||
{
|
||
abort_unless($quoteChange->isEditable() && $quoteChange->created_by === user_id(), 403);
|
||
if ($quoteChange->hasQuotePayload() && ($onboarding = $this->requotes->onboardingForCourier($quoteChange->carrier_name))) {
|
||
return redirect()->route('business.courier-onboardings.requote', $onboarding);
|
||
}
|
||
$quotes = $this->snapshot->load()['quotes'] ?? [];
|
||
$source = $this->service->findSourceQuote($quoteChange->source_quote_id);
|
||
$quoteChange->load('items');
|
||
|
||
return view('business.pages.courier-payables.quote-change-editor', $this->editorData($quoteChange, $quotes, $source));
|
||
}
|
||
|
||
public function update(Request $request, CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
$change = $this->service->update($quoteChange, $this->validatedChange($request, false), user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.edit', $change)
|
||
->with('success', "已保存变更草稿 {$change->number}。");
|
||
}
|
||
|
||
public function submit(CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
$change = $this->service->submit($quoteChange, user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.show', $change)
|
||
->with('success', "{$change->number} 已提交审核。");
|
||
}
|
||
|
||
public function approve(CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
abort_unless($this->canReview(), 403, '当前账号没有报价审核权限。');
|
||
$change = $this->service->approve($quoteChange, user_id());
|
||
|
||
$message = "审核完成，已生成新报价版本 {$change->version->version_code}。";
|
||
|
||
try {
|
||
$this->signatureService->prepareVersion($change->version, user_id());
|
||
$message .= ' 签署 PDF 已生成并固定校验值。';
|
||
} catch (\Throwable $exception) {
|
||
report($exception);
|
||
$message .= ' 签署 PDF 生成失败，可在详情页重试。';
|
||
}
|
||
|
||
if ($change->isRetrospective()) {
|
||
$message .= ' 历史生效已登记，但补差核算尚未执行，请查看核算状态和阻断原因。';
|
||
}
|
||
|
||
// 已入驻快递：按入驻资料直接推送到快递的 e签宝。
|
||
if ($change->hasQuotePayload() && ($onboarding = $this->requotes->onboardingForCourier($change->carrier_name))) {
|
||
try {
|
||
app(CourierOnboardingService::class)->pushVersion($onboarding, $change->version, (int) user_id());
|
||
$message .= " 已推送到快递 e签宝（{$onboarding->esign_operator_name} {$onboarding->esign_account}），等待签署。";
|
||
} catch (\Throwable $exception) {
|
||
report($exception);
|
||
$reason = $exception instanceof \Illuminate\Validation\ValidationException ? collect($exception->errors())->flatten()->first() : '推送失败';
|
||
$message .= " 推送 e签宝失败：{$reason}，可在下方重新推送。";
|
||
}
|
||
}
|
||
|
||
return redirect()->route('business.courier-quote-changes.show', $change)
|
||
->with('success', $message);
|
||
}
|
||
|
||
/** 已入驻快递的变价版本按入驻资料（重新）推送到快递 e签宝。 */
|
||
public function pushToCourier(CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
abort_unless($this->canReview(), 403, '当前账号没有报价审核权限。');
|
||
$onboarding = $this->requotes->onboardingForCourier($quoteChange->carrier_name);
|
||
abort_if($onboarding === null || $quoteChange->version === null, 404);
|
||
app(CourierOnboardingService::class)->pushVersion($onboarding, $quoteChange->version, (int) user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.show', $quoteChange)
|
||
->with('success', "{$quoteChange->version->version_code} 已推送到快递 e签宝，等待签署。");
|
||
}
|
||
|
||
/** 作废发错的报价版本（未签完的同时撤回 e签宝 签署任务）。 */
|
||
public function void(Request $request, CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
abort_unless($this->canReview(), 403, '当前账号没有报价审核权限。');
|
||
abort_if($quoteChange->version === null, 404);
|
||
$data = $request->validate(
|
||
['void_reason' => ['required', 'string', 'min:2', 'max:500']],
|
||
['void_reason.required' => '请写明作废原因，例如：江苏面单多打了一位。'],
|
||
);
|
||
$message = $this->requotes->voidVersion($quoteChange->version, trim($data['void_reason']), (int) user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.show', $quoteChange)->with('success', $message);
|
||
}
|
||
|
||
public function returnForChanges(Request $request, CourierQuoteChange $quoteChange): RedirectResponse
|
||
{
|
||
abort_unless($this->canReview(), 403, '当前账号没有报价审核权限。');
|
||
$validated = $request->validate([
|
||
'review_note' => ['required', 'string', 'min:2', 'max:1000'],
|
||
]);
|
||
$change = $this->service->returnForChanges($quoteChange, $validated['review_note'], user_id());
|
||
|
||
return redirect()->route('business.courier-quote-changes.show', $change)
|
||
->with('success', "{$change->number} 已退回发起人修改。");
|
||
}
|
||
|
||
private function validatedChange(Request $request, bool $requiresSource): array
|
||
{
|
||
$rules = [
|
||
'change_type' => ['required', 'in:费率调整,面单调整,规则备注,执行日期,其他'],
|
||
'effective_date' => ['required', 'date_format:Y-m-d'],
|
||
'summary' => ['required', 'string', 'min:2', 'max:2000'],
|
||
'items' => ['required', 'array', 'min:1', 'max:500'],
|
||
'items.*.source_cell' => ['required', 'regex:/^[A-Z]+[1-9][0-9]*$/'],
|
||
'items.*.source_row' => ['required', 'integer', 'min:0'],
|
||
'items.*.source_column' => ['required', 'integer', 'min:0'],
|
||
'items.*.region' => ['nullable', 'string', 'max:255'],
|
||
'items.*.weight_band' => ['nullable', 'string', 'max:255'],
|
||
'items.*.charge_item' => ['nullable', 'string', 'max:255'],
|
||
'items.*.original_amount' => ['required', 'numeric', 'min:0', 'decimal:0,4'],
|
||
'items.*.new_amount' => ['required', 'numeric', 'min:0', 'decimal:0,4'],
|
||
'items.*.unit' => ['nullable', 'string', 'max:32'],
|
||
'items.*.note' => ['nullable', 'string', 'max:500'],
|
||
];
|
||
|
||
if ($requiresSource) {
|
||
$rules['source_quote_id'] = ['required', 'string', 'max:32'];
|
||
}
|
||
|
||
return $request->validate($rules);
|
||
}
|
||
|
||
private function editorData(?CourierQuoteChange $change, array $quotes, array $source): array
|
||
{
|
||
$existingItems = $change?->items->keyBy('source_cell') ?? collect();
|
||
|
||
return [
|
||
'change' => $change,
|
||
'quotes' => $quotes,
|
||
'source' => $source,
|
||
'editableCells' => $this->editableCells($source, $existingItems),
|
||
];
|
||
}
|
||
|
||
private function editableCells(array $source, $existingItems): array
|
||
{
|
||
$values = $source['values'];
|
||
$cells = [];
|
||
|
||
foreach ($values as $rowIndex => $row) {
|
||
foreach ($row as $columnIndex => $value) {
|
||
if (! is_numeric($value)) {
|
||
continue;
|
||
}
|
||
|
||
$formula = $source['formulas'][$rowIndex][$columnIndex] ?? null;
|
||
|
||
if (is_string($formula) && trim($formula) !== '') {
|
||
continue;
|
||
}
|
||
|
||
$cell = $this->columnName($columnIndex) . ($rowIndex + 1);
|
||
$existing = $existingItems->get($cell);
|
||
$cells[] = [
|
||
'source_cell' => $cell,
|
||
'source_row' => $rowIndex,
|
||
'source_column' => $columnIndex,
|
||
'region' => $this->nearestText($row, $columnIndex - 1) ?? $this->nearestText($row, 0),
|
||
'weight_band' => $this->headerText($values, $rowIndex, $columnIndex),
|
||
'charge_item' => $this->headerText($values, $rowIndex, $columnIndex),
|
||
'original_amount' => number_format((float) $value, 4, '.', ''),
|
||
'new_amount' => $existing?->new_amount ?? number_format((float) $value, 4, '.', ''),
|
||
'unit' => $existing?->unit,
|
||
'note' => $existing?->note,
|
||
'selected' => $existing !== null,
|
||
];
|
||
}
|
||
}
|
||
|
||
return $cells;
|
||
}
|
||
|
||
private function headerText(array $values, int $row, int $column): ?string
|
||
{
|
||
for ($index = $row - 1; $index >= 0; $index--) {
|
||
$candidate = $values[$index][$column] ?? null;
|
||
|
||
if (is_string($candidate) && trim($candidate) !== '') {
|
||
return trim($candidate);
|
||
}
|
||
}
|
||
|
||
return null;
|
||
}
|
||
|
||
private function nearestText(array $row, int $column): ?string
|
||
{
|
||
for ($index = $column; $index >= 0; $index--) {
|
||
$candidate = $row[$index] ?? null;
|
||
|
||
if (is_string($candidate) && trim($candidate) !== '') {
|
||
return trim($candidate);
|
||
}
|
||
}
|
||
|
||
return null;
|
||
}
|
||
|
||
private function columnName(int $column): string
|
||
{
|
||
$name = '';
|
||
|
||
do {
|
||
$name = chr(65 + ($column % 26)) . $name;
|
||
$column = intdiv($column, 26) - 1;
|
||
} while ($column >= 0);
|
||
|
||
return $name;
|
||
}
|
||
|
||
private function refreshSignatures(): void
|
||
{
|
||
try {
|
||
$this->signatureService->refreshPending();
|
||
} catch (\Throwable $exception) {
|
||
report($exception);
|
||
}
|
||
}
|
||
|
||
private function canReview(): bool
|
||
{
|
||
return in_array(SystemAccess::roleName(user()), [SystemAccess::SUPER_ADMIN, SystemAccess::ADMIN], true);
|
||
}
|
||
}
|