20261008-ide1.0发布 #1

Merged

zzh merged 42 commits from test into master 2026-10-08 09:18:00 +08:00

Conversation 0 Commits 42 Files Changed 215 +11817 -2623

zzh commented 2026-10-08 09:17:36 +08:00

Owner

Copy Link

20261008-ide1.0发布

20261008-ide1.0发布

zzh added 42 commits 2026-10-08 09:17:37 +08:00

feat：对接fake oss dd1318bc00

merge master into test: 揽收下游预报与近期功能，保留 fake oss ... 5648163958

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 合并 master 后改用 IObjectStorage，对齐 fake oss ... c9084ee5ca

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 加固本地存储失败不回滚创单，并完善揽收大包轨迹同步 ... 26c840cdb1

避免 /app/wwwroot 不可写时预报成功被回滚；同步推送 test 部署出口资质等已合入能力。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 揽收大包轨迹手动同步接口，并支持管理员重置密码 ... dd4644e914

新增 track-upsert-big-bag 返回三步联调结果；补齐 reset-password API。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 9610汇总下单关联出口资质，并补齐批量模板字段 ... ddb8efba15

下单/导入在 9610Summary 时校验并落库 ExportQualificationId（可回落默认备案），写入 9610 申报企业信息；专线小包模板长宽高改必填并增加资质备案列。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 9610汇总下单必填电商平台写入预报，并增强官网产品目录筛选项 ... 6c8f7cb781

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 9610预报下游网关地址改为取自 api_center 配置 ... 8226542ffd

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 新增大包轨迹同步下发 apiCode ... 3bde909238

Co-authored-by: Cursor <cursoragent@cursor.com>

chore: retrigger test deploy for 9610 downstream forward ... 2836601062

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 9610预报下游回写下游单号兼容 serviceNo/orderNo ... 24b8c29c9b

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 揽收承运推送件重尺并按卖价买价出账 ... 5fb6888b55

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 揽收推费按承运运单号 CarrierWaybillNo 匹配 ... 955a3c8c6d

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 客户 OpenAPI 机机凭证与 whoami 探针 ... 2688058cb3

一主客户一对 AppKey/AppSecret，支持门户自助与后台代管启停重置，供应商回调路径不动。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: openApi 分组暴露推费与下单，去掉 OMS 侧 appKey 校验 ... a3b54b6b07

Swagger openApi 提供 /openapi/pickup-order/push-fee 与 /openapi/parcel/create；删除 method 路由与 whoami。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: openApi 统一信封与推费字段对齐，下单鉴权改请求头 ... 87f4cebc9b

推费入参对齐表字段；创建订单凭证走 appKey/appSecret Header，去掉上门揽收与 Body 内 customerId。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: OpenAPI 鉴权改 HMAC 签名校验，并完善下单报文处理 ... 1b6e91b09d

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 同一产品/渠道下卖价买价费用项唯一，禁止重复新增 ... 79099776a5

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 主数据新增兼容软删唯一键，避免 Duplicate entry ... b17e6639a4

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 统一价格/黑名单/偏远分区匹配，并落库 MatchDim ... 74a71991b2

Co-authored-by: Cursor <cursoragent@cursor.com>

test: 补齐 GB/CA 字母数字邮编前缀、精确与闭区间匹配 ... c91d8ca0e6

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 收紧分区 range、进位相接与仅国家估算口径 ... b748aa4000

进位区间改为左开右闭且禁止空洞，邮编 range 按数字/字母数字比较，查价仅国家时不再串用别国 zone。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: OpenAPI 增加轨迹/文件查询，创单按 clientNo 幂等 ... f063c99d1b

客户 HMAC 通过后再查本客户订单；禁止下游面单，附件增加 POD。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: OpenAPI 轨迹/文件补 Swagger 请求体 schema ... 5bf81b5138

FromBody 仅用于文档展示，验签仍读原始 Body。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 分区明细导入模板去掉国家名称，并增加枚举值 Sheet ... 04dc9ca1ff

导入模板只保留国家代码；Sheet2 列出匹配维度/方式的编码与名称，导入时按代码补国家名称。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 增加 /file-storage 接口，供附件预览按对象 key 流式读取 ... 14c42db752

补 normalize-key 与 stream，兼容带或不带 admin 前缀的 COS 路径。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 销售产品独立改代码，分区明细导入保存按规则去重 ... 8d7df40bdf

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 落地滚动会员、券发放与邀请分成奖励 ... f972a28d79

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 卖价支持多价格分区表，列表返回创建/修改人 ... 6faadcf2a1

合并多 Area 分区规则进发布快照，计费用规则自身 AreaId 匹配；产品与渠道列表补 CreateBy/UpdateBy。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 卖价/买价列表支持按需加载明细，缩短切换卡顿 ... a164d8c837

列表接口增加 includeDetails，并新增单条 price/get，供编辑弹窗按需拉取完整矩阵。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 销售产品页签按需加载版本头和渠道下拉，避免分页拉取整份快照 ... b38499963d

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 卖价/规则发布钉 KPI 分区包，快照只存引用 ... bb8c0a906c

分区明细独立版本化并缓存加载，计费包缺失严格失败；同步态接口不再拉全文。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 渠道买价/规则发布钉 KPI 分区包，排货应付按渠道价区解析 ... 35156eedf4

各渠道异构价区与偏远不再复用产品卖价 zoneKeys；发布只存包引用，计费 hydrate 后硬失败。

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: KPI 分区导入支持增量/全量，删除分区级联明细 ... ae4e733a71

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 会员概览补充等级编码与图标，收发件人国家返回二字码 ... 9e5d6d20d5

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 分区明细全量查询去掉 ORDER BY，避免查价 sort_buffer 溢出 ... a9f8373ec3

大分区表全量 ORDER BY Id 会打满 MySQL sort_buffer；组包仍在内存排序，并补充 (AreaId, Id) 索引脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 分区包按 Id 查询避免大 JSON 参与 ORDER BY filesort ... 1704c9f1e2

bb8c0a9 后查价 hydrate 会 SELECT Content 并 ORDER BY，大分区包打满 sort_buffer；改为先取 Id 再按主键加载。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 卖价同步态对比改用 canonical JSON，避免误报待发布 ... 73f334edc8

待发布与线上两侧统一规范化后再算哈希，消除排序与 FactorValuesJson 形态差异导致的假 diff。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 买价发布落库也走 canonical JSON，与同步态对比一致 ... c2ac20df04

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 发布同步态按 ContentHash 语义对比，且不再 Ensure 写包 ... 0449a4a3f5

sync-status 用 ResolvePackRef；哈希忽略 PackVersion/AreaName。修复卖价页发布后因价格行签名跳过刷新导致徽章卡在待发布。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: sync-status 只比当前配置与生效 Content，前端不参与计算 ... 7d14c0e5d9

当前侧与发布同源组装但不 Ensure；两侧同一套规范化并忽略 PackVersion/AreaName。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: sync-status 忽略价表明细数字 JSON 形态差异 ... 984799fcde

LIVE 侧 DeserializeJsonObject 常把客户组价收到 long，历史 Content 里常见 133.0/0.0000；JS 结构相等但 SHA256 不等导致误报待发布。

Co-authored-by: Cursor <cursoragent@cursor.com>

zzh merged commit 769cc8a0b4 into master 2026-10-08 09:18:00 +08:00

zzh referenced this issue from a commit 2026-10-08 09:18:01 +08:00

Merge pull request '20261008-ide1.0发布' (#1) from test into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ideship/admin#1

No description provided.