WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

快递应付：报价维护只留报价页签 + 附加费结算定时同步（每日7天/每周90天） #314

Merged
zhoushengchen merged 2 commits from feature/zhoushengchen-surcharge-schedule into main 2026-10-12 17:49:11 +08:00
Conversation 0 Commits 2 Files Changed 7 +53 -80
zhoushengchen commented 2026-10-12 17:49:06 +08:00
Collaborator
Copy Link

变更内容

  1. 「附加费报价维护」只保留「附加费报价」页签；附加费结算统一走快递应付独立页 courier-surcharge-settlement。旧地址 ?page=courier-surcharge&tab=settlement 302 跳转到独立页并保留查询参数。
  2. 部署脚本 cron 新增：每天 06:30（Asia/Shanghai）滚动重算最近 7 天；每周一 06:40 重算最近 90 天，补齐晚到的退货进仓与审批变化；复用 caiwu-upstream-sync.lock 互斥锁。

修改文件

  • app/Http/Controllers/Business/Pages.php
  • config/business_navigation.php
  • resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php
  • tests/Feature/Business/CourierSurchargeSettlementPageTest.php
  • deploy/activate-release.sh
  • deploy/activate-incremental-release.sh
  • tests/Unit/Deployment/BusinessMirrorScheduleTest.php

验证

  • CourierSurcharge 相关：31 passed / 284 assertions（含新增「报价页只暴露报价页签」「旧结算地址 302 跳独立页」）。
  • BusinessMirrorScheduleTest：新增 cron 断言通过；该文件另有 2 个 main 既有失败（compose 配置相关），未触碰。
  • 本地实际页面：报价页仅剩报价；旧地址跳转正常。

影响范围

  • 无数据库迁移；涉及页面导航与部署脚本 cron；不涉及金额计算逻辑变更。
## 变更内容 1. 「附加费报价维护」只保留「附加费报价」页签；附加费结算统一走快递应付独立页 `courier-surcharge-settlement`。旧地址 `?page=courier-surcharge&tab=settlement` 302 跳转到独立页并保留查询参数。 2. 部署脚本 cron 新增：每天 06:30（Asia/Shanghai）滚动重算最近 7 天；每周一 06:40 重算最近 90 天，补齐晚到的退货进仓与审批变化；复用 `caiwu-upstream-sync.lock` 互斥锁。 ## 修改文件 - app/Http/Controllers/Business/Pages.php - config/business_navigation.php - resources/views/business/pages/courier-payables/courier-surcharge-workspace.blade.php - tests/Feature/Business/CourierSurchargeSettlementPageTest.php - deploy/activate-release.sh - deploy/activate-incremental-release.sh - tests/Unit/Deployment/BusinessMirrorScheduleTest.php ## 验证 - CourierSurcharge 相关：31 passed / 284 assertions（含新增「报价页只暴露报价页签」「旧结算地址 302 跳独立页」）。 - BusinessMirrorScheduleTest：新增 cron 断言通过；该文件另有 2 个 main 既有失败（compose 配置相关），未触碰。 - 本地实际页面：报价页仅剩报价；旧地址跳转正常。 ## 影响范围 - 无数据库迁移；涉及页面导航与部署脚本 cron；不涉及金额计算逻辑变更。
zhoushengchen added 2 commits 2026-10-12 17:49:06 +08:00
zhoushengchen merged commit c55c06026f into main 2026-10-12 17:49:11 +08:00
zhoushengchen deleted branch feature/zhoushengchen-surcharge-schedule 2026-10-12 17:49:13 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
aaron chenxi DoDo jj404877757 limeng qiuxiang renshen shanshi sumu wangshu yueyang yutu zhoushengchen WuYongJie
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WuYongJie/CaiWuXiTong#314
No description provided.
Delete Branch "feature/zhoushengchen-surcharge-schedule"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?