1.05 #7

Merged
zzh merged 19 commits from test into master 2026-10-15 13:59:09 +08:00

19 Commits

Author SHA1 Message Date
zzh
aa4c4a28e6 fix: 排货后创建轨迹订单转发创单时的 Authorization
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
消费端没有登录态会导致轨迹网关 401;创单时写入预报任务再带到轨迹事件。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-15 09:23:15 +08:00
zzh
a30958843b fix: 首次创建轨迹订单无跟踪号时用客户单号占位
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
轨迹侧 TrackNo 必填,后续有真实跟踪号再 Upsert 更新。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-15 09:14:52 +08:00
zzh
5fd25d479c fix: 去掉创单后置步骤表,轨迹订单改在排货成功后创建
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
回到创单提交后各自投递;并在下单接口注释同步与 MQ 步骤。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-15 09:05:26 +08:00
zzh
34c47a3173 fix: 创单后置步骤随订单落库,提交后再单独执行
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
进程重启或事务回滚不再丢掉 9610、轨迹和揽收;排货完成后再补轨迹、面单和计费相关触发。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-14 20:07:51 +08:00
zzh
61b6f9a9b9 fix: 创单事务释放后再提交 9610、轨迹和揽收事件
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
避免在创单事务里写 Outbox 征用不到连接,导致这三类事件被丢掉。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-14 19:37:56 +08:00
zzh
79fa20a9ca fix: 创单成功后把预报计费和后续事件拆开提交
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
预报计费失败不再把订单留在处理中,轨迹、面单和自动触发在创单提交后各自入队。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-14 19:23:07 +08:00
7b69bbf207 test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m4s
2026-10-14 17:07:35 +08:00
a1d2dece57 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
2026-10-14 16:41:31 +08:00
38d36eb812 升级 2026-10-14 16:40:31 +08:00
zzh
b7be742046 feat: 店铺订单支持仓储代发(wms)建单,放宽创建状态限制
All checks were successful
Build and Deploy / deploy (push) Successful in 4m34s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-14 15:39:31 +08:00
37a7f74a96 Merge remote-tracking branch 'prod/test' into test 2026-10-14 14:35:44 +08:00
zzh
e85dfb80b5 feat: 仓配开放 API 与后台用户启停
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
新增 warehouseOpenApi(Token/入库/件重尺/红外图),并在 fk_user 支持 IsEnabled 禁用登录。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-13 17:53:00 +08:00
ff9c589956 fix
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
2026-10-13 17:20:12 +08:00
cba741ea8a clear cache
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
2026-10-13 17:01:53 +08:00
8cfff8ef81 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 6s
2026-10-13 16:46:12 +08:00
09ca1c96d7 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 15s
2026-10-13 16:25:22 +08:00
551ac09f78 feat:升级框架总线
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
2026-10-13 15:20:53 +08:00
cf77ffe943 Merge remote-tracking branch 'prod/test' into test 2026-10-13 10:54:45 +08:00
zzh
d5d6305f9c feat: 自动触发规则支持 Excel 导入与模板下载
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-12 15:31:19 +08:00