|
|
00935c1aa3
|
Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales
# Conflicts:
# app/Http/Controllers/Business/Pages.php
# modules/EcommerceFinance/View/BillOffsetPageData.php
# modules/EcommerceFinance/View/OrderDataPageData.php
# resources/views/business/pages/order-data/bill-offset.blade.php
# tests/Feature/Business/PagesTest.php
# tests/Unit/EcommerceFinance/BillOffsetMirrorRepositoryTest.php
|
2026-09-09 17:14:26 +08:00 |
|
|
|
98ec0d0e23
|
fix: 账单冲减复用售后费用取数
|
2026-09-09 16:52:24 +08:00 |
|
|
|
b66f223ebb
|
修复账单冲减取数和工单加载，整合快递页面上线 (#141)
|
2026-09-09 14:04:43 +08:00 |
|
|
|
3d14eb3b7e
|
fix: use original bill amount for 500112 offset
|
2026-09-09 12:18:06 +08:00 |
|
|
|
f2e8396007
|
账单冲减子页面改为复用订单售后费用明细同源数据
- BillOffsetPageData 注入 OrderDataPageData，page() 改为调用 afterSales()，使账单冲减子页面与订单售后费用明细页同源取数。
- 子页面按 账单冲减.xlsx 表头展示 9 列：内部订单号、线上订单号、店铺名称、店铺编码、商品编码、款式编码、店铺商品编码、店铺款式编码、500112冲减收入。
- 新增查询、重置与“导出当前页”按钮（沿用售后页前端 CSV 导出逻辑），并展示本页 500112 冲减收入合计。
- 500112 列本地镜像暂为 null，接入真实科目来源后自动填充，无需改模板。
|
2026-09-08 17:33:17 +08:00 |
|
|
|
b5d87eae35
|
feat: add bill offset mirror page and export
|
2026-09-08 13:09:23 +08:00 |
|
