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

332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zzh
9e5d6d20d5 feat: 会员概览补充等级编码与图标，收发件人国家返回二字码
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:34:32 +08:00
zzh
ae4e733a71 feat: KPI 分区导入支持增量/全量，删除分区级联明细 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:34:31 +08:00
zzh
35156eedf4 feat: 渠道买价/规则发布钉 KPI 分区包，排货应付按渠道价区解析
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
各渠道异构价区与偏远不再复用产品卖价 zoneKeys；发布只存包引用，计费 hydrate 后硬失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 17:19:39 +08:00
zzh
bb8c0a906c feat: 卖价/规则发布钉 KPI 分区包，快照只存引用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
分区明细独立版本化并缓存加载，计费包缺失严格失败；同步态接口不再拉全文。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 16:42:42 +08:00
zzh
b38499963d feat: 销售产品页签按需加载版本头和渠道下拉，避免分页拉取整份快照
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 14:20:17 +08:00
zzh
a164d8c837 feat: 卖价/买价列表支持按需加载明细，缩短切换卡顿
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
Details 
列表接口增加 includeDetails，并新增单条 price/get，供编辑弹窗按需拉取完整矩阵。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 13:36:19 +08:00
zzh
6faadcf2a1 feat: 卖价支持多价格分区表，列表返回创建/修改人
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details 
合并多 Area 分区规则进发布快照，计费用规则自身 AreaId 匹配；产品与渠道列表补 CreateBy/UpdateBy。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-07 10:57:21 +08:00
zzh
f972a28d79 feat: 落地滚动会员、券发放与邀请分成奖励
All checks were successful
Build and Deploy / deploy (push) Successful in 3m50s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 17:40:24 +08:00
zzh
8d7df40bdf feat: 销售产品独立改代码，分区明细导入保存按规则去重 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 15:37:03 +08:00
zzh
14c42db752 feat: 增加 /file-storage 接口，供附件预览按对象 key 流式读取
All checks were successful
Build and Deploy / deploy (push) Successful in 1m8s
Details 
补 normalize-key 与 stream，兼容带或不带 admin 前缀的 COS 路径。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 12:21:06 +08:00
zzh
04dc9ca1ff feat: 分区明细导入模板去掉国家名称，并增加枚举值 Sheet
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
导入模板只保留国家代码；Sheet2 列出匹配维度/方式的编码与名称，导入时按代码补国家名称。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 10:58:23 +08:00
zzh
5bf81b5138 fix: OpenAPI 轨迹/文件补 Swagger 请求体 schema 
FromBody 仅用于文档展示，验签仍读原始 Body。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-06 10:39:28 +08:00
zzh
f063c99d1b feat: OpenAPI 增加轨迹/文件查询，创单按 clientNo 幂等 
客户 HMAC 通过后再查本客户订单；禁止下游面单，附件增加 POD。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 18:48:21 +08:00
zzh
b748aa4000 fix: 收紧分区 range、进位相接与仅国家估算口径
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
进位区间改为左开右闭且禁止空洞，邮编 range 按数字/字母数字比较，查价仅国家时不再串用别国 zone。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 17:35:18 +08:00
zzh
c91d8ca0e6 test: 补齐 GB/CA 字母数字邮编前缀、精确与闭区间匹配
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 16:30:18 +08:00
zzh
74a71991b2 feat: 统一价格/黑名单/偏远分区匹配，并落库 MatchDim
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 16:12:09 +08:00
zzh
b17e6639a4 fix: 主数据新增兼容软删唯一键，避免 Duplicate entry
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 11:53:08 +08:00
zzh
79099776a5 feat: 同一产品/渠道下卖价买价费用项唯一，禁止重复新增 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-05 11:23:38 +08:00
zzh
1b6e91b09d feat: OpenAPI 鉴权改 HMAC 签名校验，并完善下单报文处理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 17:33:46 +08:00
zzh
87f4cebc9b feat: openApi 统一信封与推费字段对齐，下单鉴权改请求头
All checks were successful
Build and Deploy / deploy (push) Successful in 56s
Details 
推费入参对齐表字段；创建订单凭证走 appKey/appSecret Header，去掉上门揽收与 Body 内 customerId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 12:17:50 +08:00
zzh
a3b54b6b07 feat: openApi 分组暴露推费与下单，去掉 OMS 侧 appKey 校验
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Swagger openApi 提供 /openapi/pickup-order/push-fee 与 /openapi/parcel/create；删除 method 路由与 whoami。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 10:36:24 +08:00
zzh
2688058cb3 feat: 客户 OpenAPI 机机凭证与 whoami 探针
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
一主客户一对 AppKey/AppSecret，支持门户自助与后台代管启停重置，供应商回调路径不动。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 10:19:38 +08:00
zzh
955a3c8c6d fix: 揽收推费按承运运单号 CarrierWaybillNo 匹配
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 19:56:40 +08:00
zzh
5fb6888b55 feat: 揽收承运推送件重尺并按卖价买价出账
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 19:19:24 +08:00
zzh
24b8c29c9b fix: 9610预报下游回写下游单号兼容 serviceNo/orderNo
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 14:50:27 +08:00