|
|
a0c99c3e8d
|
新增店铺收款京喜账单页签并从京东账单切分
在京东账单右侧新增京喜账单页签，复用京东日账单的取数、列定义、筛选、排序、分页与导出，只增加平台维度过滤：京东账单排除京喜店铺，京喜账单只取京喜店铺。平台口径集中在 config/jd_bill_platform.php 与 JdBillPlatform（含口径切换起始日期参数，默认全量历史），仓库通过 forPlatform() 收窄，两个口径互补、总额守恒，底层镜像数据不修改不删除。真实镜像实测：京喜 488,464 笔 + 京东 210,983 笔 = 拆分前 699,447 笔，收入/支出/差额逐项误差为 0。
|
2026-09-28 19:25:53 +08:00 |
|
|
|
9bee8e3f46
|
Merge branch 'feature/qiuxiang-vipshop-jx-account'
|
2026-09-28 17:52:27 +08:00 |
|
|
|
a08b28199d
|
新增店铺收款唯品会JX账户页签
店铺收款账户账单新增 vipshop-jx 页签：导航配置、列定义、控制器与前端路由；读取共享账单表 ec_account_bills 中的唯品会JX（JITX）原始账单（店铺/类型/二次备注/销售订单号/含税金额），按金额正负拆出收入与支出，订单日期由销售订单号前 6 位还原（原始账单无日期列）。DB 页签日期统一按 Y-m-d H:i:s 返回，JX 页签汇总口径为收支净额，并补齐单元与功能测试。
|
2026-09-28 17:51:41 +08:00 |
|
|
|
26556a9169
|
Add warehouse short names to inventory report
Restore warehouse name mapping ledger and inventory short-name column.
|
2026-09-28 16:33:38 +08:00 |
|
|
|
e73183f52e
|
merge: allow deploy after migration removal
|
2026-09-28 13:14:11 +08:00 |
|
|
|
469992982e
|
fix: ignore deleted migrations in deploy guard
|
2026-09-28 13:13:53 +08:00 |
|
|
|
4fd1a792d4
|
merge: revert inventory mapping release
|
2026-09-28 13:11:23 +08:00 |
|
|
|
454919b0c7
|
Revert "Merge branch 'fix/chenxi-inventory-mapping-release-20260928'"
This reverts commit c328dcbe77e114d1111c22ca22870227ad280ab7, reversing
changes made to bfbfe935eab814027d7d2328accc18a60171a712.
|
2026-09-28 12:00:54 +08:00 |
|
chenxi
|
403f66b94f
|
Merge branch 'fix/chenxi-deploy-tunnel-process'
|
2026-09-28 10:53:11 +08:00 |
|
chenxi
|
bc65d7c7e2
|
保留独立增量镜像隧道进程
|
2026-09-28 10:53:05 +08:00 |
|
chenxi
|
36fee605c6
|
Merge branch 'fix/chenxi-regctl-executable'
|
2026-09-28 10:49:37 +08:00 |
|
chenxi
|
b1c2eabac4
|
修正 macOS 增量发布工具执行权限
|
2026-09-28 10:49:32 +08:00 |
|
chenxi
|
6210d496ba
|
Merge branch 'fix/chenxi-deploy-ssh-reuse'
|
2026-09-28 10:47:22 +08:00 |
|
chenxi
|
913be7d3ce
|
复用发布 SSH 连接避免服务器限流
|
2026-09-28 10:47:12 +08:00 |
|
chenxi
|
7d8b290220
|
Merge branch 'fix/chenxi-scp-array-splat'
|
2026-09-28 10:43:37 +08:00 |
|
chenxi
|
5afe009a80
|
修正 macOS SCP 参数数组传递
|
2026-09-28 10:43:33 +08:00 |
|
chenxi
|
0ae62c5258
|
Merge branch 'fix/chenxi-macos-scp-compat'
|
2026-09-28 10:40:40 +08:00 |
|
chenxi
|
1c35d088df
|
兼容生产服务器旧版 SCP 上传
|
2026-09-28 10:40:36 +08:00 |
|
chenxi
|
e23fc595d6
|
Merge branch 'fix/chenxi-macos-deploy-runner'
|
2026-09-28 10:35:56 +08:00 |
|
chenxi
|
93cce7224e
|
修正 macOS 前端构建 PATH
|
2026-09-28 10:35:50 +08:00 |
|
chenxi
|
8b6731d0d8
|
支持从 macOS 工作站运行正式发布脚本
|
2026-09-28 10:13:14 +08:00 |
|
|
|
51b3529fea
|
merge: rename vipshop account to mp account
|
2026-09-28 09:38:26 +08:00 |
|
|
|
0c1e73f405
|
fix: rename vipshop account to mp account
|
2026-09-28 09:35:11 +08:00 |
|
chenxi
|
c328dcbe77
|
Merge branch 'fix/chenxi-inventory-mapping-release-20260928'
|
2026-09-28 09:24:49 +08:00 |
|
chenxi
|
72777aa44e
|
Merge remote-tracking branch 'origin/main' into fix/chenxi-inventory-mapping-release-20260928
|
2026-09-28 09:16:35 +08:00 |
|
chenxi
|
f562faca3c
|
完善进销存映射表与开发环境刷新配置
|
2026-09-28 09:16:02 +08:00 |
|
|
|
bfbfe935ea
|
新增淘系支付宝权威账单导入链路
|
2026-09-27 17:25:04 +08:00 |
|
|
|
2c02f80b01
|
在后台页脚显示构建版本标识
|
2026-09-27 14:29:03 +08:00 |
|
|
|
296e528482
|
小额打款工单：筛选下拉可滚动 + 完成日期改为账单页同款日历 (#276)
- 店铺/打款原因筛选项改为自绘可滚动面板（原生 datalist 高度与滚动不可控）
- 完成日期改为与账单页一致的日历控件（文本输入 + 日历按钮 + 中文月历弹层）
值只承载日期，服务端补成整天半开区间，避免分钟级边界丢单
- 测试：php artisan test --filter=SmallPayment 16 passed (126 assertions)
|
2026-09-27 13:45:18 +08:00 |
|
|
|
07e055f335
|
修复唯品会账户页签脚本发布校验
|
2026-09-27 10:03:04 +08:00 |
|
chenxi
|
cc8687f8fb
|
新增进销存报表年月选择器
|
2026-09-27 01:21:27 +08:00 |
|
chenxi
|
18fdb8a22f
|
支持进销存多月份权威快照
|
2026-09-26 22:45:37 +08:00 |
|
chenxi
|
4782cf62c8
|
修复八月进销存报表重复计数
|
2026-09-26 19:40:23 +08:00 |
|
chenxi
|
75f9c1b0b9
|
固定生产镜像为 amd64
|
2026-09-26 03:48:04 +08:00 |
|
chenxi
|
6a9bee82e9
|
支持跨平台部署镜像工具
|
2026-09-26 03:42:25 +08:00 |
|
chenxi
|
9e89fe3bf2
|
隔离部署前端构建进程
|
2026-09-26 03:36:42 +08:00 |
|
chenxi
|
7f1570401d
|
修复部署构建脚本路径传递
|
2026-09-26 03:34:40 +08:00 |
|
chenxi
|
299c95a6e6
|
修复正式部署脚本路径解析
|
2026-09-26 03:32:01 +08:00 |
|
chenxi
|
f92ed47def
|
修复进销存报表大数据导出
|
2026-09-26 03:21:14 +08:00 |
|
chenxi
|
39885bccea
|
Merge inventory export improvements
|
2026-09-25 22:44:59 +08:00 |
|
chenxi
|
3d2f27fb1a
|
优化进销存报表全量导出批次查询
|
2026-09-25 22:36:11 +08:00 |
|
chenxi
|
86706bf20a
|
完善进销存报表筛选范围与列导出
|
2026-09-25 21:37:57 +08:00 |
|
chenxi
|
f03a362410
|
Merge inventory report monthly logic
|
2026-09-25 20:28:05 +08:00 |
|
chenxi
|
dd5f075b65
|
Merge latest main into inventory report branch
|
2026-09-25 20:25:01 +08:00 |
|
chenxi
|
0143dfe693
|
修正进销存月报按已确认进出仓明细取数
|
2026-09-25 20:10:45 +08:00 |
|
|
|
ca5fa5be08
|
feat: collapse secondary report query fields
|
2026-09-24 23:58:46 +08:00 |
|
|
|
75b12df493
|
feat: 完善财务报表字段查询与排序
合并店铺和主体经营报表的字段查询布局，补齐数值筛选、排序和镜像状态提示。
|
2026-09-24 20:23:41 +08:00 |
|
|
|
c424ffffce
|
fix: calculate withdrawal compliance from dated amounts
按余额减提现金额与预留标准计算达标状态，并接入提现金额日期化导入。
Co-authored-by: 92451 <924518135@qq.com>
Co-committed-by: 92451 <924518135@qq.com>
|
2026-09-24 19:34:09 +08:00 |
|
|
|
e224cbebc3
|
fix: remove shipping sync order join timeout
|
2026-09-24 18:27:45 +08:00 |
|
|
|
896e3fefa7
|
重试发货同步的上游连接超时 (#272)
|
2026-09-24 16:24:59 +08:00 |
|
