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

附加费结算：超长费/退回费/拦截费拉取、导入核验与模板导出 #305

Merged
zhoushengchen merged 4 commits from feature/zhoushengchen-surcharge-settlement into main 2026-10-12 09:33:25 +08:00
Conversation 0 Commits 4 Files Changed 13 +3757 -14
zhoushengchen commented 2026-10-12 09:33:14 +08:00
Collaborator
Copy Link

做了什么

  • 附加费报价与结算整合为同一入口两个页签，结算页读取共享镜像表 courier_surcharge_settlement_rows
  • 超长费按启用报价规则从销售出库单拉取（courier-surcharge:pull-overlength）
  • 退回费/拦截费按启用报价规则从查件扣单拉取，退回费结合售后退货退款进仓与实退数量，拦截费按扣单固定单价（courier-surcharge:pull-return）
  • 结算行补齐出库时间、平台商品ID、商品编码、店铺、线上订单号、查件类型/原因、退回单号、结算重量等字段
  • 页面新增导入核验（单号+附加费类型+快递名称+可选金额），返回正常结/不结原因与差异金额，并提供导入模板下载
  • 数据同步命令当前手动执行，未接定时任务

验证

  • 相关测试 30 passed / 280 assertions
  • 本地页面、导出、导入核验、模板下载均已实际验收
  • 迁移仅新增共享镜像表 courier_surcharge_settlement_rows
## 做了什么 - 附加费报价与结算整合为同一入口两个页签，结算页读取共享镜像表 courier_surcharge_settlement_rows - 超长费按启用报价规则从销售出库单拉取（courier-surcharge:pull-overlength） - 退回费/拦截费按启用报价规则从查件扣单拉取，退回费结合售后退货退款进仓与实退数量，拦截费按扣单固定单价（courier-surcharge:pull-return） - 结算行补齐出库时间、平台商品ID、商品编码、店铺、线上订单号、查件类型/原因、退回单号、结算重量等字段 - 页面新增导入核验（单号+附加费类型+快递名称+可选金额），返回正常结/不结原因与差异金额，并提供导入模板下载 - 数据同步命令当前手动执行，未接定时任务 ## 验证 - 相关测试 30 passed / 280 assertions - 本地页面、导出、导入核验、模板下载均已实际验收 - 迁移仅新增共享镜像表 courier_surcharge_settlement_rows
zhoushengchen added 4 commits 2026-10-12 09:33:14 +08:00 
(cherry picked from commit a83347aef3c9069df2f521df9b4cbe1096255a33)
(cherry picked from commit 4b79370faea61aefe05dfe058480600b6fe9981e)
- 超长费按报价规则从销售出库单拉取；退回费/拦截费从查件扣单拉取，并补出库时间、平台商品ID、线上订单号等字段
- 页面新增导入核验（单号+附加费类型+快递名称+可选金额），返回正常结/不结原因与差异金额，并提供导入模板下载

(cherry picked from commit 1fbb924924006a0813a6c30d6a9336259026902b)
- 新方案不需要 ekf_Bookkeeping / express_Original / ekf_rCheck 等旧镜像数据集，恢复 main 配置，避免生产无谓同步
- 去掉重复的 ekf_ReturnPickupManagement 旧注册与未使用的 JushuitanShopBalanceRepository 依赖
zhoushengchen merged commit 1e689d254e into main 2026-10-12 09:33:25 +08:00
zhoushengchen deleted branch feature/zhoushengchen-surcharge-settlement 2026-10-12 09:33:26 +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#305
No description provided.
Delete Branch "feature/zhoushengchen-surcharge-settlement"

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?