ideship/admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
357 Commits 3 Branches 0 Tags 16 MiB
bdc02af39a
Commit Graph

357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzh
bdc02af39a Merge pull request '1.05' (#7) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m52s
Details 
Reviewed-on: #7
 2026-10-15 13:59:08 +08:00
zzh
aa4c4a28e6 fix: 排货后创建轨迹订单转发创单时的 Authorization
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
消费端没有登录态会导致轨迹网关 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
Details 
轨迹侧 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
Details 
回到创单提交后各自投递；并在下单接口注释同步与 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
Details 
进程重启或事务回滚不再丢掉 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
Details 
避免在创单事务里写 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
Details 
预报计费失败不再把订单留在处理中，轨迹、面单和自动触发在创单提交后各自入队。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 19:23:07 +08:00
xiaolipro
7b69bbf207 test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m4s
Details
2026-10-14 17:07:35 +08:00
xiaolipro
a1d2dece57 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details
2026-10-14 16:41:31 +08:00
xiaolipro
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
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 15:39:31 +08:00
xiaolipro
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
Details 
新增 warehouseOpenApi（Token/入库/件重尺/红外图），并在 fk_user 支持 IsEnabled 禁用登录。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 17:53:00 +08:00
xiaolipro
ff9c589956 fix
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details
2026-10-13 17:20:12 +08:00
xiaolipro
cba741ea8a clear cache
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details
2026-10-13 17:01:53 +08:00
xiaolipro
8cfff8ef81 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 6s
Details
2026-10-13 16:46:12 +08:00
xiaolipro
09ca1c96d7 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 15s
Details
2026-10-13 16:25:22 +08:00
xiaolipro
551ac09f78 feat：升级框架总线
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
Details
2026-10-13 15:20:53 +08:00
xiaolipro
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
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 15:31:19 +08:00
zzh
031899b3ee 1.04
All checks were successful
Build and Deploy / deploy (push) Successful in 1m42s
Details 
1.04
 2026-10-10 19:35:37 +08:00
zzh
32156dcfe0 fix: 轨迹订单 trackNo 仅取跟踪号，变更后重新 Upsert
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:20:09 +08:00
zzh
fa9777bd08 fix: SqlSugar 与 EF Outbox 连接冲突时回落短事务
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
发布集成事件前先挂 Outbox 上下文；连接不匹配时 RequiresNew 写 Outbox，避免预报等按钮报 transaction not associated。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:01:15 +08:00
zzh
6c3a094126 feat: 下游 getFile 转存 COS，并修复集成事件 Outbox 事务
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
新增获取下游文件接口；事件发布统一走事务性 UoW，避免批量预报等按钮报 Outbox 错误。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 18:45:40 +08:00
xiaolipro
6d085d999a 1
Some checks failed
Build and Deploy / deploy (push) Failing after 37s
Details
2026-10-10 17:36:36 +08:00
zzh
a34bd9051f 1.03
Some checks failed
Build and Deploy / deploy (push) Has been cancelled
Details 
1.03
 2026-10-10 17:06:46 +08:00
xiaolipro
89f5ecab42 Merge remote-tracking branch 'prod/test' into test
Some checks failed
Build and Deploy / deploy (push) Failing after 3m37s
Details
2026-10-10 16:46:04 +08:00
xiaolipro
957ea62f70 Merge pull request '1.03' (#4) from mq into test
Some checks failed
Build and Deploy / deploy (push) Has been cancelled
Details 
Reviewed-on: #4
 2026-10-10 16:46:05 +08:00
xiaolipro
586a6b6834 change 2026-10-10 16:41:28 +08:00
zzh
8df0f37165 feat: 订单编辑支持服务商单号并完善操作日志快照
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
开放 DownstreamServiceNo 更新，补充包裹计费相关操作码与字段快照，便于运单详情编辑留痕。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 16:27:49 +08:00
xiaolipro
6f56edc6a4 Merge remote-tracking branch 'prod/test' into test 2026-10-10 15:42:36 +08:00
zzh
64737284f3 feat: 运单操作日志改为列表摘要，补齐费用/支付/预报/打印埋点
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 11:46:33 +08:00
zzh
dcd985bca4 feat: 创单/出入库后置副作用接入 Fake.EventBus，预报计费排货走 MQ 
将轨迹、面单、9610、揽收、自动触发与 ForecastBilling 异步化，缩短扫码与下单 RT；队列未启用时同步回落。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 10:54:24 +08:00
zzh
a874c849c4 1.02
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
1.02
 2026-10-09 18:24:29 +08:00
zzh
da27fa4377 feat: 重算应付放行锁渠道池校验，支持切换价格/规则版本与服务商名称
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 18:16:38 +08:00
zzh
2b0158acb4 feat: 运单操作日志 MVP，记录编辑/件重尺/重算/排货字段变更
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 17:32:33 +08:00
xiaolipro
0f508c656f Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details
2026-10-09 16:16:14 +08:00
xiaolipro
ce82c102a4 feat: 升级框架 2026-10-09 16:15:59 +08:00
zzh
358738c333 feat: 揽收单支持改信息/件重尺/重算费用，创建后自动预报下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
创建成功后自动下游预报回写承运单号并升为已预约；详情可改揽收信息与件重尺并按卖买价重算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 16:12:12 +08:00
zzh
6852135774 feat: 仓库地址排序备注与用户注册错误提示
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
仓库地址增加排序/备注字段与迁移；用户创建时对邮箱冲突等给出明确中文提示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 14:12:36 +08:00
zzh
811795f74c Merge pull request 'fix: 裂变邀请人发券，并合并营销 SQL 到 admin1008' (#2) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Details 
Reviewed-on: #2
 2026-10-08 17:44:33 +08:00
zzh
c3d21dfdbb fix: 裂变邀请人发券，并合并营销 SQL 到 admin1008
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
Details 
补齐被邀请人首单派送成功后给邀请人发放 REFERRAL_INVITER；将分散 migrate 脚本合并为可重复执行的 admin1008.sql。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-08 17:30:22 +08:00
zzh
769cc8a0b4 Merge pull request '20261008-ide1.0发布' (#1) from test into master
All checks were successful
Build and Deploy / deploy (push) Successful in 1m56s
Details 
Reviewed-on: #1
 2026-10-08 09:18:00 +08:00
zzh
984799fcde fix: sync-status 忽略价表明细数字 JSON 形态差异
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
LIVE 侧 DeserializeJsonObject 常把客户组价收到 long，历史 Content 里常见 133.0/0.0000；JS 结构相等但 SHA256 不等导致误报待发布。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 19:52:04 +08:00
zzh
7d14c0e5d9 fix: sync-status 只比当前配置与生效 Content，前端不参与计算
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
当前侧与发布同源组装但不 Ensure；两侧同一套规范化并忽略 PackVersion/AreaName。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 19:38:58 +08:00
zzh
0449a4a3f5 fix: 发布同步态按 ContentHash 语义对比，且不再 Ensure 写包
All checks were successful
Build and Deploy / deploy (push) Successful in 57s
Details 
sync-status 用 ResolvePackRef；哈希忽略 PackVersion/AreaName。修复卖价页发布后因价格行签名跳过刷新导致徽章卡在待发布。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 19:21:17 +08:00
zzh
c2ac20df04 fix: 买价发布落库也走 canonical JSON，与同步态对比一致
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 19:14:45 +08:00
zzh
73f334edc8 fix: 卖价同步态对比改用 canonical JSON，避免误报待发布
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
待发布与线上两侧统一规范化后再算哈希，消除排序与 FactorValuesJson 形态差异导致的假 diff。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 19:13:26 +08:00
zzh
1704c9f1e2 fix: 分区包按 Id 查询避免大 JSON 参与 ORDER BY filesort
All checks were successful
Build and Deploy / deploy (push) Successful in 57s
Details 
bb8c0a9 后查价 hydrate 会 SELECT Content 并 ORDER BY，大分区包打满 sort_buffer；改为先取 Id 再按主键加载。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 18:59:45 +08:00
zzh
a9f8373ec3 fix: 分区明细全量查询去掉 ORDER BY，避免查价 sort_buffer 溢出
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
大分区表全量 ORDER BY Id 会打满 MySQL sort_buffer；组包仍在内存排序，并补充 (AreaId, Id) 索引脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 18:42:41 +08:00