|
|
a03b9017a6
|
perf: avoid unnecessary bill offset joins
|
2026-09-08 14:05:51 +08:00 |
|
|
|
5a34782dcd
|
Merge remote-tracking branch 'origin/main' into feature/sumu-bill-offset
# Conflicts:
# tests/Feature/Business/PagesTest.php
|
2026-09-08 13:19:38 +08:00 |
|
|
|
b5d87eae35
|
feat: add bill offset mirror page and export
|
2026-09-08 13:09:23 +08:00 |
|
|
|
9ad1b1c6bb
|
feat: 接入快递运费对账业务镜像 (#118)
|
2026-09-08 12:26:04 +08:00 |
|
|
|
b2b5c33d47
|
管理员按需查看与复制店铺密码 (#116)
|
2026-09-08 07:02:25 +08:00 |
|
|
|
62533293ae
|
fix: 隔离 ClickHouse 回填代次 (#113)
|
2026-09-07 22:58:12 +08:00 |
|
|
|
a2b3db3afa
|
fix: show vip marketing promotion flow
|
2026-09-07 18:03:07 +08:00 |
|
|
|
d66f0cf119
|
fix: align vip tab with tax declaration data
|
2026-09-07 17:02:03 +08:00 |
|
|
|
050ad0ab97
|
feat: 整合淘系支付宝账单共享业务镜像 (#109)
|
2026-09-07 14:41:37 +08:00 |
|
|
|
a989734b33
|
fix: query only the active promotion platform (#108)
|
2026-09-07 14:22:18 +08:00 |
|
|
|
a1c0e245d6
|
Merge remote-tracking branch 'origin/main'
|
2026-09-07 12:28:52 +08:00 |
|
|
|
d46ed01a81
|
feat: merge promotion bills into marketing account bills
|
2026-09-07 12:27:46 +08:00 |
|
|
|
be670ad988
|
feat: stage tiered business data storage (#104)
|
2026-09-07 11:55:37 +08:00 |
|
|
|
d48cb7d639
|
feat: 店铺维度报表条件查询与主体归属字段接入
实际修改:
- 店铺维度报表新增真实数据库条件查询:店铺字段走共享镜像 SQL
WHERE,主体/能否变更/生效/失效走生命周期行级过滤(左闭右开)
- 店铺负责人/部门负责人/利润中心改为店铺账号 PostgreSQL 镜像值,
按店铺名称关联,未匹配时回退经营分析副本库原值
- 能否变更按主表 platform 判定(唯品会MP/淘工厂=否,其余=是),
筛选改为 是/否 下拉;默认生效时间 2026-07-01,失效未记录显示存续中
- 主体维度经营报表接入生命周期收入窗口与注册地址解析市字段
- 同步更新视图测试并重写 StoreReportRepositoryTest 匹配 SQLite 实现
验证:容器内 tests/Feature/Business + tests/Unit/EcommerceFinance +
tests/Unit/Business 共 324 passed / 4 skipped;真实数据端到端验证
(无筛选 1935 行、负责人/利润中心/失效区间筛选抽样全对)。
无新增数据库迁移,不涉及生产数据写入。
|
2026-09-06 19:27:51 +08:00 |
|
|
|
4ef1208b2f
|
聚水潭小额打款工单页面 (#102)
## 任务占用与边界
- 任务名称:聚水潭聚工单-协同工单-打款工单-小额打款页面
- 实际开发者:yueyang
- 任务来源/团队分工:退款数据子页面接入
- 目标结果:在“退款”下新增小额打款子页面,读取共享业务镜像,支持分页、筛选、汇总、导出和同步状态提示。
- 预计修改路径:Pages Controller、business_navigation、upstream_mirrors、镜像 Repository、Blade 页面、admin 路由、测试、镜像清单文档。
- 将写入的公共契约:页面 slug、管理路由、镜像数据集注册(jiansun 两张表)、Mirror Repository。
- 仅复用、明确不修改的公共契约:现有共享镜像连接、同步框架、权限校验、导航结构和通用分页/导出模式。
- 数据源、表/视图和字段:jiansun.dbo.jst_workOrderInfo、jiansun.dbo.jst_small_payment_order_map;固定小额打款工单类型 82D94F5C54544EE3833CD8A3AB8B9F73。
- 上游 source_key / scope:source_key=jiansun;沿用团队共享连接 scope。
- 明确不修改的范围:不执行共享数据库迁移、不执行首次全量同步、不修改 .env/APP_KEY、不配置 operations_replica。
## 开工碰撞检查
- [x] 已执行团队预检并核对 origin/main 与远程任务分支
- [x] 已搜索主线既有页面、接口、Repository 和数据查询
- [x] 已区分将写入与仅复用的公共契约
- [x] 未发现实际写入重叠
## 实际改动
- 新增退款“小额打款”页面及导航入口。
- 新增 SmallPaymentWorkOrderMirrorRepository:共享镜像分页、稳定排序、筛选、金额汇总、导出行和状态判断。
- 注册 jst_workOrderInfo 与 jst_small_payment_order_map 镜像数据集,并补充真实 businessFieldList 解析字段。
- 增加页面、Repository、导航和同步器相关测试。
## 验证证据
- 相关测试:19 项通过,143 个断言通过。
- Blade 缓存、PHP 语法检查、git diff --check 通过。
- 实际本地页面已打开,导航显示“小额打款”;首次同步未执行时页面明确显示“业务镜像尚未建立”。
- route:cache 受项目已有重复 livewire.update 路由影响失败,与本次改动无关;普通路由列表和视图缓存正常。
## 风险检查
- [x] 未提交 .env、密码、Token、私钥、真实财务数据、生产日志或构建产物
- [x] 不涉及共享数据库迁移或生产数据写入
- [x] 前端复用现有 VIP 黑金设计令牌和共享页面结构
## 合并前复查
- [ ] PR 不再是 WIP,需在完成最终自审和测试后移除 WIP 前缀。
- [ ] Codex 已用 origin/main...任务分支复核完整 diff。
Reviewed-on: http://git.1080p.hk/WuYongJie/CaiWuXiTong/pulls/102
|
2026-09-04 13:54:17 +08:00 |
|
|
|
cb02ca8a36
|
feat: show Jushuitan work orders on after-sales pages
|
2026-09-03 14:28:26 +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 |
|
|
|
36d0dc688b
|
feat: 接入聚水潭仓内未发工单镜像
|
2026-09-01 14:34:37 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e45b876108
|
feat: 重建店铺收款账户管理
|
2026-09-01 09:38:03 +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
|
2026-08-31 22:24:31 +08:00 |
|
|
|
6c4dfe5983
|
feat: 接入店铺维度报表真实账单
|
2026-08-31 22:19:41 +08:00 |
|
|
|
c7da919bed
|
补齐安装明细筛选和子表权限校验 (#91)
|
2026-08-31 22:01:47 +08:00 |
|
chenxi
|
d1f82b5ccf
|
feat: separate installation detail tables
|
2026-08-31 21:50:38 +08:00 |
|
chenxi
|
7bf81ba286
|
fix: fill installation child transaction number
|
2026-08-31 19:47:51 +08:00 |
|
chenxi
|
e9c398e3fe
|
fix: map installation child source number
|
2026-08-31 19:46:41 +08:00 |
|
chenxi
|
6d3ad190d0
|
Merge installation detail expansion
|
2026-08-31 19:42:21 +08:00 |
|
chenxi
|
7cff0d6940
|
feat: expand installation detail items
|
2026-08-31 19:42:06 +08:00 |
|
|
|
604531adac
|
集成原型支线并修复共享镜像字段和导航权限 (#88)
|
2026-08-31 19:20:15 +08:00 |
|
|
|
c44d178799
|
统一多数据库接入、声明式镜像及接入配置修复 (#87)
|
2026-08-31 18:49:00 +08:00 |
|
chenxi
|
cc43de57e7
|
Merge remote-tracking branch 'origin/main' into feature/chenxi-installation-fee-mirror
|
2026-08-31 18:17:10 +08:00 |
|
chenxi
|
5c5a137760
|
fix: avoid reserved summary alias
|
2026-08-31 18:08:29 +08:00 |
|
chenxi
|
b6cefe776b
|
feat: join installation item mirror and summaries
|
2026-08-31 17:59:39 +08:00 |
|
|
|
11c79a2146
|
修复云数据库管理不支持 PostgreSQL 连接 (#85)
|
2026-08-31 17:26:25 +08:00 |
|
chenxi
|
b12749bf8d
|
feat: connect installation details to business mirror
|
2026-08-31 17:05:12 +08:00 |
|
|
|
fdc42dd84d
|
Merge DingTalk status consistency and preserve existing labels
|
2026-08-31 16:15:08 +08:00 |
|
|
|
f31509222a
|
fix: align ding payable workflow status with DingTalk
|
2026-08-31 14:13:30 +08:00 |
|
|
|
5679a41105
|
fix: preserve production promotion account page
|
2026-08-29 18:54:09 +08:00 |
|
|
|
255d47f69e
|
feat: 应付云仓车费流程时间与状态筛选 (#82)
|
2026-08-29 11:38:14 +08:00 |
|
|
|
17f5b7719e
|
fix: sync courier signing operator accounts
|
2026-08-29 11:30:30 +08:00 |
|
|
|
66d90edeef
|
feat: 接入工作平台快递资料界面
|
2026-08-29 11:30:29 +08:00 |
|
|
|
b371b9137d
|
fix: 同模板钉钉应付流程稳定增量同步 (#81)
|
2026-08-29 11:15:35 +08:00 |
|