diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index fdded647..a765dd60 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -381,6 +381,14 @@ class Pages extends Controller abort_if(empty($sectionConfig), 403, '当前账号没有该页面权限。'); + // 附加费结算已独立到快递应付页面,旧页签地址跳到新页面。 + if ($section === 'courier-payables' && $page === 'courier-surcharge' && $tab === 'settlement') { + return redirect()->route('business.pages.show', array_merge(request()->query(), [ + 'section' => $section, + 'page' => 'courier-surcharge-settlement', + ])); + } + $pages = collect($sectionConfig['pages'] ?? []); if ($pages->isEmpty()) { @@ -3782,7 +3790,7 @@ class Pages extends Controller protected function contentForCourierSurcharge(?string $tab = null): array { $clean = static fn (mixed $value, int $length = 60): string => mb_substr(trim((string) $value), 0, $length); - $quoteInput = $tab === 'settlement' ? [] : request()->query(); + $quoteInput = request()->query(); $filters = [ 'keyword' => $clean($quoteInput['keyword'] ?? '', 40), 'courier' => $clean($quoteInput['courier'] ?? '', 40), @@ -3810,10 +3818,6 @@ class Pages extends Controller 'courierSurchargeAuditLogs' => $this->courierSurchargeAudits->recent(), ]; - if ($tab === 'settlement') { - $content += $this->contentForCourierSurchargeSettlement(); - } - return $content; } diff --git a/config/business_navigation.php b/config/business_navigation.php index 74252365..e45a5bf5 100644 --- a/config/business_navigation.php +++ b/config/business_navigation.php @@ -713,7 +713,6 @@ $navigation = [ 'title' => '附加费报价维护', 'tabs' => [ ['slug' => 'quotes', 'title' => '附加费报价'], - ['slug' => 'settlement', 'title' => '附加费结算'], ], ], ], diff --git a/deploy/activate-incremental-release.sh b/deploy/activate-incremental-release.sh index 1f26c98c..024c6291 100644 --- a/deploy/activate-incremental-release.sh +++ b/deploy/activate-incremental-release.sh @@ -204,6 +204,10 @@ CRON_TZ=Asia/Shanghai # 头条放心购(店铺收款账户账单 › 抖音账户)资金流水:每天 09:30 定点把该渠道所用 # 原始账单镜像追平一次,保证上班前当日/前一日流水已进系统,而不是等每分钟轮转慢慢走。 30 9 * * * root /usr/bin/flock -w 1800 /run/caiwu-upstream-sync.lock /usr/bin/docker exec -u www-data caiwu_app php artisan business-mirror:sync-tables operations_replica.rpt.jst_originalBillInfo --max-batches=20 --quiet >/dev/null 2>&1 +# 附加费结算:每天滚动重算最近 7 天;每周一再把最近 90 天全量重算一次, +# 补齐晚到的退货进仓与审批变化(超长费按出库日期、退回费/拦截费按查件工单创建时间)。 +30 6 * * * root /usr/bin/flock -w 1800 /run/caiwu-upstream-sync.lock /bin/sh -c '/usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-overlength --days=7 --quiet; /usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-return --days=7 --quiet' >/dev/null 2>&1 +40 6 * * 1 root /usr/bin/flock -w 3600 /run/caiwu-upstream-sync.lock /bin/sh -c '/usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-overlength --days=90 --quiet; /usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-return --days=90 --quiet' >/dev/null 2>&1 EOF chmod 644 /etc/cron.d/caiwu-jiansun-snapshots diff --git a/deploy/activate-release.sh b/deploy/activate-release.sh index b6bd03a5..1e437ae7 100644 --- a/deploy/activate-release.sh +++ b/deploy/activate-release.sh @@ -208,6 +208,10 @@ CRON_TZ=Asia/Shanghai # 头条放心购(店铺收款账户账单 › 抖音账户)资金流水:每天 09:30 定点把该渠道所用 # 原始账单镜像追平一次,保证上班前当日/前一日流水已进系统,而不是等每分钟轮转慢慢走。 30 9 * * * root /usr/bin/flock -w 1800 /run/caiwu-upstream-sync.lock /usr/bin/docker exec -u www-data caiwu_app php artisan business-mirror:sync-tables operations_replica.rpt.jst_originalBillInfo --max-batches=20 --quiet >/dev/null 2>&1 +# 附加费结算:每天滚动重算最近 7 天;每周一再把最近 90 天全量重算一次, +# 补齐晚到的退货进仓与审批变化(超长费按出库日期、退回费/拦截费按查件工单创建时间)。 +30 6 * * * root /usr/bin/flock -w 1800 /run/caiwu-upstream-sync.lock /bin/sh -c '/usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-overlength --days=7 --quiet; /usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-return --days=7 --quiet' >/dev/null 2>&1 +40 6 * * 1 root /usr/bin/flock -w 3600 /run/caiwu-upstream-sync.lock /bin/sh -c '/usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-overlength --days=90 --quiet; /usr/bin/docker exec -u www-data caiwu_app php artisan courier-surcharge:pull-return --days=90 --quiet' >/dev/null 2>&1 EOF chmod 644 /etc/cron.d/caiwu-jiansun-snapshots diff --git a/resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php b/resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php index 41ce8674..e6d9dbc0 100644 --- a/resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php +++ b/resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php @@ -1,63 +1,5 @@ -@php - $surchargeTabUrls = collect(['quotes', 'settlement'])->mapWithKeys(fn ($tab) => [ - $tab => route('business.pages.show', ['section' => 'courier-payables', 'page' => 'courier-surcharge', 'tab' => $tab]), - ])->all(); -@endphp