|
|
005e8eec4a
|
merge: retain verified fixes on latest shared main
|
2026-09-09 14:01:32 +08:00 |
|
|
|
367cf10728
|
fix: align bill offset source and close release verification gaps
|
2026-09-09 14:01:00 +08:00 |
|
|
|
5dcab54e06
|
feat: 增加线上代发价格筛选和导出
|
2026-09-09 13:56:38 +08:00 |
|
|
|
7cba2d4770
|
Merge commit '2127d6677c8709b18489d77ad673a536fd90c49a' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:10 +08:00 |
|
|
|
60591c2731
|
Merge commit '3d14eb3b7e9e3e61f9be314f160585edca18f863' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:09 +08:00 |
|
|
|
216c5fcb63
|
Merge commit 'd13cb9d' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:08 +08:00 |
|
|
|
9e71f29df1
|
Merge commit '44e7a5c' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:07 +08:00 |
|
|
|
674d8e6b38
|
Merge commit 'a830ed7bb7d434718e946ed0dfb468e3b3b97f3b' into feature/WuYongJie-integrate-latest-delivery
|
2026-09-09 13:22:06 +08:00 |
|
|
|
01a2e6bfa8
|
统一财务账单表格排版与交互 (#139)
|
2026-09-09 13:21:38 +08:00 |
|
|
|
d13cb9d3e0
|
fix: preserve online daifa identifiers in exports
|
2026-09-09 13:18:04 +08:00 |
|
chenxi
|
a830ed7bb7
|
Merge remote-tracking branch 'origin/main' into feature/chenxi-table-layout-interactions
|
2026-09-09 13:10:03 +08:00 |
|
|
|
44e7a5c645
|
fix: keep surcharge column help unobtrusive
|
2026-09-09 12:43:58 +08:00 |
|
|
|
a4276a9465
|
feat: 增加线上代发价格筛选和导出
|
2026-09-09 12:34:19 +08:00 |
|
|
|
9e8ef780d2
|
Merge remote-tracking branch 'origin/main' into feature/zhoushengchen-courier-table-interaction
|
2026-09-09 12:24:49 +08:00 |
|
|
|
e4d48c59eb
|
feat: enhance courier surcharge table interactions
|
2026-09-09 12:24:35 +08:00 |
|
|
|
3d14eb3b7e
|
fix: use original bill amount for 500112 offset
|
2026-09-09 12:18:06 +08:00 |
|
chenxi
|
056f8321e5
|
feat: unify receiving bill table interactions
|
2026-09-09 12:17:38 +08:00 |
|
|
|
284ba38337
|
取消共享镜像接入与同步的重复人工审批 (#138)
|
2026-09-09 12:05:38 +08:00 |
|
|
|
784e82b0a2
|
支持直接使用密码部署并自动复用本机登录信息 (#137)
|
2026-09-09 11:54:21 +08:00 |
|
|
|
914a3fe352
|
取消普通生产发布的重复授权要求 (#136)
|
2026-09-09 11:40:00 +08:00 |
|
|
|
c3eb8e0fee
|
Merge remote-tracking branch 'origin/main' into feature-sumu-bill-offset-after-sales
|
2026-09-09 11:17:08 +08:00 |
|
|
|
a50b7596e8
|
修复小额打款工单关联未命中组合索引 (#135)
|
2026-09-09 10:53:53 +08:00 |
|
chenxi
|
ee41eaac86
|
chore: publish table interaction task scope
|
2026-09-09 10:47:37 +08:00 |
|
|
|
46107e196f
|
发布小额打款索引修复与线上代发价格 (#134)
|
2026-09-09 10:46:17 +08:00 |
|
|
|
a2c420c74f
|
精简开发规则并补齐表格交互要求 (#133)
|
2026-09-08 23:03:15 +08:00 |
|
|
|
7fa8284255
|
支持明确指定的钉钉主管理员首次登录 (#132)
|
2026-09-08 22:21:44 +08:00 |
|
|
|
230962f6a3
|
修复支付宝账单翻页重复全表计数 (#131)
|
2026-09-08 21:46:34 +08:00 |
|
|
|
f2508eeaeb
|
淘系支付宝账单切换经营分析副本镜像 (#129)
|
2026-09-08 19:50:55 +08:00 |
|
|
|
e1d62f0d79
|
修复当前页密码网关分片读取 (#130)
|
2026-09-08 18:25:37 +08:00 |
|
|
|
d14c8acb82
|
店铺密码在当前页直接显示 (#125)
|
2026-09-08 17:33:47 +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 |
|
|
|
2127d6677c
|
Merge remote-tracking branch 'origin/main' into feature/renshen-courier-reconciliation-details
|
2026-09-08 16:56:23 +08:00 |
|
|
|
64ff368170
|
Merge remote-tracking branch 'origin/main' into feature/renshen-courier-reconciliation-details
|
2026-09-08 16:43:24 +08:00 |
|
|
|
a2138704fb
|
修复店铺维度报表店铺 ID 并新增店铺名称列 (#128)
|
2026-09-08 16:40:36 +08:00 |
|
|
|
b65702147c
|
补全用户分组入口并统一侧边栏字号 (#127)
|
2026-09-08 16:14:28 +08:00 |
|
|
|
c67ac02b74
|
fix: 补齐运费对账供应商字段
|
2026-09-08 15:49:07 +08:00 |
|
|
|
0ffd89e9b5
|
feat: 接入快递运费对账明细镜像
|
2026-09-08 15:43:08 +08:00 |
|
|
|
d876822a6e
|
修复生产健康检查被应用防火墙误拦截 (#123)
|
2026-09-08 14:46:38 +08:00 |
|
|
|
c7ac541334
|
用户多分组及分组页面权限 (#122)
|
2026-09-08 14:30:48 +08:00 |
|
|
|
6fa73352d0
|
build: use bundled dockerfile frontend
|
2026-09-08 14:08:43 +08:00 |
|
|
|
a03b9017a6
|
perf: avoid unnecessary bill offset joins
|
2026-09-08 14:05:51 +08:00 |
|
|
|
5812612bd3
|
perf: add bill offset order join index
|
2026-09-08 14:01:58 +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 |
|
|
|
e94d556125
|
用户管理布局与管理员身份权限设置 (#119)
|
2026-09-08 12:02:22 +08:00 |
|
|
|
8dc9f3bc6f
|
feat: 店铺账号密码页显示真实绑定手机号
- 「绑定手机号」字段取消 secret 遮蔽,页面与导出均显示镜像中的真实手机号
- 更新 StoreAccountMirrorRepositoryTest 与 PrototypePageTest 覆盖新行为
- 密码配置状态列已由 #116 完成,本提交不重复改动
|
2026-09-08 11:41:59 +08:00 |
|
|
|
0b988a4b99
|
未配置权限的钉钉用户默认显示完整业务页面 (#117)
|
2026-09-08 11:29:32 +08:00 |
|
|
|
b2b5c33d47
|
管理员按需查看与复制店铺密码 (#116)
|
2026-09-08 07:02:25 +08:00 |
|