fix: 账单冲减复用订单售后费用口径 #146

Merged
sumu merged 8 commits from feature-sumu-bill-offset-after-sales into main 2026-09-09 17:42:43 +08:00

8 Commits

Author SHA1 Message Date
7e1bee3893 Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales 2026-09-09 17:14:39 +08:00
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
f35e5008ad Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales 2026-09-09 14:06:01 +08:00
3d14eb3b7e fix: use original bill amount for 500112 offset 2026-09-09 12:18:06 +08:00
c3eb8e0fee Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales 2026-09-09 11:17:08 +08:00
398c80f5a8 账单冲减/售后明细:接入 500112 冲减收入取数(暂用退货红冲金额)
- OrderDataRepository 与 OrderDataMirrorRepository 的 afterSales() 现对 account_500112 取数:\n  暂以「退货红冲金额(reversal_order_amount,即负值商品金额的绝对值)」作为收入冲减口径。\n- 该字段此前在 expenseFields() 中仅被列示、从未取值,故本地恒为 null;\n  其余 account_* 科目字段仍为空,待科目归集(金蝶/外部科目源)整体接入。\n- 取数口径为临时占位,待财务确认最终规则后替换(集中在一处,易于调整)。\n- 账单冲减子页面本页 500112 合计已可正常汇总。
2026-09-08 17:33:18 +08:00
f2e8396007 账单冲减子页面改为复用订单售后费用明细同源数据
- BillOffsetPageData 注入 OrderDataPageData,page() 改为调用 afterSales(),使账单冲减子页面与订单售后费用明细页同源取数。
- 子页面按 账单冲减.xlsx 表头展示 9 列:内部订单号、线上订单号、店铺名称、店铺编码、商品编码、款式编码、店铺商品编码、店铺款式编码、500112冲减收入。
- 新增查询、重置与“导出当前页”按钮(沿用售后页前端 CSV 导出逻辑),并展示本页 500112 冲减收入合计。
- 500112 列本地镜像暂为 null,接入真实科目来源后自动填充,无需改模板。
2026-09-08 17:33:17 +08:00