305 Commits

Author SHA1 Message Date
cb02ca8a36 feat: show Jushuitan work orders on after-sales pages 2026-09-03 14:28:26 +08:00
7e64d24458 feat: complete courier e-sign workflow and PDF rendering 2026-09-03 13:54:00 +08:00
992e5a6da7 fix: separate progress author and board identity 2026-09-02 18:47:14 +08:00
88526b9619 附加费类型字典自维护(含进仓费) (#98)
## 任务占用与边界
- 任务名称:附加费类型字典自维护
- 实际开发者:zhoushengchen
- 目标结果:在快递附加费报价维护页支持附加费类型的新增、启用/停用;新增报价仅可选择启用类型,历史报价保留原类型。
- 预计修改路径:附加费类型 Repository、Model、Controller、报价 Repository/Controller、页面、管理路由、类型表迁移和专项测试。
- 将写入的公共契约:business.courier-surcharge.types.store、business.courier-surcharge.types.status、business_courier_surcharge_types。
- 仅复用、不修改的公共契约:business.pages.show、business.courier-surcharge.store。
- 明确不修改的范围:上游数据库、业务镜像、七牛、生产配置和无关页面。

## 开工碰撞检查
- [x] 已检查最新 main 和所有远程任务分支
- [x] 已运行 scripts/codex-task-preflight.ps1
- [x] 未发现与其他远程任务的实际写入重叠

## 实际改动
- 新增附加费类型字典及公司范围隔离。
- 新增类型管理弹窗、创建接口、启用/停用接口。
- 报价表单和后端校验动态读取启用类型;筛选仍可查看全部类型。
- 默认初始化原有 11 种类型,并增加“进仓费”。
- 增加幂等增量迁移,补齐已执行建表迁移环境中的“进仓费”。

## 验证证据
- tests/Feature/Business/CourierSurchargePageTest.php:6 个用例、60 个断言通过。
- 相关 PHP 文件语法检查通过。
- business.courier-surcharge 路由共 5 条,路由检查通过。
- git diff --check 通过。
- 本地共享系统库现状:类型表已存在,当前公司有 11 个旧类型;增量迁移待执行。

## 风险检查
- 未提交 .env、密码、Token、私钥、真实财务数据、生产日志或构建产物。
- 前端遵循 DESIGN.md 的 VIP 黑金令牌。
- 数据库影响:仅新增类型表(若环境尚未建表)或幂等补充“进仓费”,不删除、不覆盖已有类型。
- 回滚:类型字典不做物理删除;迁移 down 保持空操作以保护业务引用。
- 已获得本次“合并 PR 并执行类型表迁移”的明确授权;迁移目标为本机当前连接的团队系统数据库,不涉及生产部署。

## 合并前复查
- [x] 已重新 fetch 远程引用并再次运行碰撞检查
- [x] 已逐文件审核 origin/main...任务分支完整 diff
- [ ] PR 创建后移除 WIP 并执行 Squash merge
- [ ] 合并后验证 main、执行迁移并验证页面

Reviewed-on: http://git.1080p.hk/WuYongJie/CaiWuXiTong/pulls/98
2026-09-02 18:22:17 +08:00
2a756edac7 快递附加费报价正式维护模块 (#97)
## 任务目标
将“快递附加费报价维护”从前端演示改为正式可持久化维护模块,新增、编辑、启停后刷新仍保留。

## 开工范围
- 将写入:`business_courier_surcharge_quotes` 数据表及迁移;`business.courier-surcharge.*` 保存、更新、状态接口;报价维护页的数据读取和维护交互;对应 Feature 测试。
- 预计路径:
  - `app/Business/CourierSurchargeQuoteRepository.php`
  - `app/Http/Controllers/Business/CourierSurchargeQuotes.php`
  - `app/Http/Controllers/Business/Pages.php`
  - `app/Models/Business/CourierSurchargeQuote.php`
  - `database/migrations/2026_09_02_000000_create_courier_surcharge_quotes_table.php`
  - `resources/views/business/pages/courier-payables/courier-surcharge.blade.php`
  - `routes/admin.php`
  - `tests/Feature/Business/CourierSurchargePageTest.php`
- 页面与路由:`courier-payables/courier-surcharge`;新增、编辑、启停使用 POST/PATCH 正式接口。
- 数据源与字段:当前公司报价规则表;快递名称、快递归属、对账人、可多选附加费类型、结算方式、计价标准、生效条件、生效日期、状态、备注。
- 权限与公共契约:复用现有 `business.page:courier-payables,courier-surcharge` 和 `business.pages.show`,不修改全局权限或共享组件。
- 明确不修改:上游数据库、业务镜像、生产配置、七牛、其他业务页面和部署脚本。

## 验证
- `docker exec -u www-data jiangling_app php artisan test tests/Feature/Business/CourierSurchargePageTest.php`
- 3 passed,41 assertions。
- PHP 语法检查及路由检查通过。
- 本地共享模式页面已实际刷新验收;由于迁移尚未在共享系统数据库执行,页面明确显示“数据表尚未就绪”并禁用维护操作。

## 风险与后续
- 新迁移尚未执行。共享系统数据库迁移属于管理员/发布授权范围,普通开发者不得直接执行;管理员完成迁移后页面即可启用正式维护。
- 不自动把旧的六条演示规则写入正式表,待产品决定是否由管理员录入或增加一次性初始化迁移。

Reviewed-on: http://git.1080p.hk/WuYongJie/CaiWuXiTong/pulls/97
2026-09-02 16:53:42 +08:00
23fda46567 fix: install eSign polling cron during release 2026-09-02 16:16:54 +08:00
59a984d32a feat: add callback-free eSign status polling 2026-09-02 16:07:16 +08:00
aaab198edb 自动同步种菜应收对账开发进度 (#95) 2026-09-01 17:52:56 +08:00
1b9e6ed2b3 feat: add installation details export (#94)
创建日期筛选文案;新增保留筛选条件的 CSV 导出;补充页面与导出回归测试。
2026-09-01 16:10:07 +08:00
3980f3f6b9 test: 补充店铺收款账户整合回归 2026-09-01 15:40:33 +08:00
853cee4ccf Merge remote-tracking branch 'origin/feature/WuYongJie-store-receiving-accounts' into feature/WuYongJie-integrate-remote-20260901
# Conflicts:
#	modules/EcommerceFinance/Repositories/BusinessInformationMirrorRepository.php
#	resources/views/business/pages/show.blade.php
2026-09-01 15:33:04 +08:00
43345e5d57 Merge remote-tracking branch 'origin/feature/qiuxiang-zhongcai-platform-tabs' into feature/WuYongJie-integrate-remote-20260901 2026-09-01 15:31:46 +08:00
b0507880ed Merge remote-tracking branch 'origin/feature/limeng-jushuitan-work-orders' into feature/WuYongJie-integrate-remote-20260901 2026-09-01 15:31:45 +08:00
adf98f2105 feat: 接入项目推进计划看板 2026-09-01 15:08:53 +08:00
qiuxiang
5b776bcbb5 feat: align taobao reconciliation headers 2026-09-01 14:59:36 +08:00
36d0dc688b feat: 接入聚水潭仓内未发工单镜像 2026-09-01 14:34:37 +08:00
qiuxiang
bfb1487adb feat: align pdd reconciliation headers 2026-09-01 14:27:55 +08:00
qiuxiang
6ce4fbe6a7 fix: remove duplicate douyin order header 2026-09-01 14:14:43 +08:00
qiuxiang
056f78a4a0 feat: align tmall reconciliation headers 2026-09-01 13:57:16 +08:00
qiuxiang
61a91d6300 feat: align jd reconciliation headers 2026-09-01 13:41:15 +08:00
qiuxiang
6614121331 Merge remote-tracking branch 'origin/main' into feature/qiuxiang-zhongcai-platform-tabs 2026-09-01 13:30:05 +08:00
qiuxiang
a58c606939 feat: align douyin reconciliation headers 2026-09-01 13:26:49 +08:00
b1bfbe2400 perf: avoid promotion sku map scans 2026-09-01 13:23:31 +08:00
344b8331f4 perf: avoid filesort on order mirror pages 2026-09-01 13:18:19 +08:00
qiuxiang
ea682327ab feat: add more zhongcai platform tabs 2026-09-01 13:11:09 +08:00
qiuxiang
5ecb3598c4 Merge remote-tracking branch 'origin/main' into feature/qiuxiang-zhongcai-platform-tabs 2026-09-01 13:08:45 +08:00
173d218d68 perf: hydrate order sku details after pagination 2026-09-01 13:01:43 +08:00
d95dc675a2 fix: materialize daily store report totals 2026-09-01 12:59:03 +08:00
8b0f15c346 fix: avoid invalid indexes on mirrored long text columns 2026-09-01 12:46:55 +08:00
qiuxiang
1f5ed4efe9 fix: disable empty platform selection 2026-09-01 11:58:26 +08:00
qiuxiang
ad893594ae Merge remote-tracking branch 'origin/main' into feature/qiuxiang-zhongcai-platform-tabs 2026-09-01 11:56:16 +08:00
qiuxiang
51450007d4 feat: add zhongcai reconciliation platform tabs 2026-09-01 11:56:16 +08:00
d62ad27d0f fix: centralize shared business data and remove local sqlite path 2026-09-01 11:34:37 +08:00
f397fbb976 fix: use local sqlite for store report 2026-09-01 11:08:35 +08:00
9a15f64490 feat: integrate finance prototype business reports 2026-09-01 10:23:00 +08:00
ec6bd21f23 fix: sync cooperation contract signing subject preview 2026-09-01 09:59:57 +08:00
e45b876108 feat: 重建店铺收款账户管理 2026-09-01 09:38:03 +08:00
1f997042d8 merge: store report shared source alignment 2026-09-01 09:15:31 +08:00
eee227711d fix: share store report bill data through business mirror 2026-09-01 09:15:17 +08:00
745c7ed302 merge: integrate store report source alignment 2026-09-01 09:02:45 +08:00
bde13f359f fix: avoid schema writes on readonly bills sqlite archive/store-report-source-aligned-20260901 2026-08-31 22:24:31 +08:00
6c4dfe5983 feat: 接入店铺维度报表真实账单 2026-08-31 22:19:41 +08:00
chenxi
75d6c80bcf Merge branch 'main' of http://git.1080p.hk/WuYongJie/CaiWuXiTong 2026-08-31 22:03:17 +08:00
chenxi
b419d3ed07 fix: place installation pagination above detail table 2026-08-31 22:03:00 +08:00
c7da919bed 补齐安装明细筛选和子表权限校验 (#91) 2026-08-31 22:01:47 +08:00
chenxi
0b0468377f fix: remove leading installation columns 2026-08-31 21:55:06 +08:00
chenxi
d1f82b5ccf feat: separate installation detail tables 2026-08-31 21:50:38 +08:00
chenxi
06a176531e Merge removal of installation summary block 2026-08-31 21:46:36 +08:00
chenxi
c484573d24 fix: remove installation summary block 2026-08-31 21:46:32 +08:00
chenxi
df5e844b80 Merge installation detail filter bar 2026-08-31 21:39:11 +08:00