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

305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zzh
2836601062 chore: retrigger test deploy for 9610 downstream forward
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 12:17:04 +08:00
zzh
3bde909238 feat: 新增大包轨迹同步下发 apiCode
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 16:58:00 +08:00
zzh
8226542ffd fix: 9610预报下游网关地址改为取自 api_center 配置
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 14:33:52 +08:00
zzh
6c8f7cb781 feat: 9610汇总下单必填电商平台写入预报，并增强官网产品目录筛选项
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 14:25:11 +08:00
zzh
ddb8efba15 feat: 9610汇总下单关联出口资质，并补齐批量模板字段
All checks were successful
Build and Deploy / deploy (push) Successful in 58s
Details 
下单/导入在 9610Summary 时校验并落库 ExportQualificationId（可回落默认备案），写入 9610 申报企业信息；专线小包模板长宽高改必填并增加资质备案列。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 16:12:39 +08:00
zzh
dd4644e914 feat: 揽收大包轨迹手动同步接口，并支持管理员重置密码
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
新增 track-upsert-big-bag 返回三步联调结果；补齐 reset-password API。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 15:00:36 +08:00
zzh
26c840cdb1 fix: 加固本地存储失败不回滚创单，并完善揽收大包轨迹同步
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
避免 /app/wwwroot 不可写时预报成功被回滚；同步推送 test 部署出口资质等已合入能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-24 09:51:02 +08:00
zzh
c9084ee5ca fix: 合并 master 后改用 IObjectStorage，对齐 fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-23 11:37:27 +08:00
zzh
5648163958 merge master into test: 揽收下游预报与近期功能，保留 fake oss 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-23 11:30:17 +08:00
zzh
26f9d8be7f feat: 揽收单预报下游改从 t_pickup_order 组装 createOrderOne
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
新增 /order/pickup-order/downstream-forward，productCode/supplierCode/地址重量商品均取揽收单，不再依赖关联物流单。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 19:17:09 +08:00
zzh
623db4ffdb fix: 服务渠道分组软删同名可恢复，并修正 COS 自定义域名签名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m44s
Details 
同名软删分组创建时恢复记录，更新时释放唯一键冲突；COS 自定义 CDN 域名关闭 signHost，并补充常见图片 Content-Type。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 19:00:12 +08:00
zzh
8ce8b82f48 feat: 客户出口资质备案与申报要素，9610 预报直连下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-22 18:13:55 +08:00
xiaolipro
dd1318bc00 feat：对接fake oss
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details
2026-09-22 16:59:33 +08:00
zzh
e5c9364434 feat: 排货规则支持判断条件公式并完善失败溯源
All checks were successful
Build and Deploy / deploy (push) Successful in 1m49s
Details 
用 MatchCondition 中文公式筛选可用渠道后再按方案选渠；失败时落完整排货过程（阶段、公式摘要、池汇总），并兼容旧 CustomerIds。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-17 19:43:05 +08:00
zzh
6b920cc49d fix: 对齐 createOrderOne 下游预报请求体，productCode 取预报渠道 code
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
Details 
移除 channelCode 等多余字段，改用专用 ItfxCreateOrderOneBody。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-16 17:43:30 +08:00
zzh
14f3df3fa5 fix: 下游预报凭证快照整套同源，避免与订单字段混拼
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-14 18:13:37 +08:00
zzh
8d1e3ab17f feat: 揽收方向与地址类型，补充迁移并清理已落地 SQL
All checks were successful
Build and Deploy / deploy (push) Successful in 1m47s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-13 23:34:55 +08:00
zzh
61d1502148 feat: 新增 /order/print/batch 同步批量返回面单地址
All checks were successful
Build and Deploy / deploy (push) Successful in 1m44s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 18:56:41 +08:00
zzh
0fdc9e29f4 feat: API中心其他配置与面单 COS 流代理
All checks were successful
Build and Deploy / deploy (push) Successful in 1m52s
Details 
将 itfx 网关优先读其他配置 api_center（含 AppKey/AppSecret 回退），面单预览经服务端代理拉取 COS。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 17:40:52 +08:00
zzh
87abcecb65 feat: 对账件重尺导入与应收只留一套
All checks were successful
Build and Deploy / deploy (push) Successful in 1m45s
Details 
新增 downstream 重量导入并锁定渠道重算应付；重算应收清空全部阶段；费用软删与查询过滤，避免预报入库叠算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 16:57:28 +08:00
zzh
43fcb4136a feat: SkuImage 存 storage key，包裹 summary，修复批次测试
All checks were successful
Build and Deploy / deploy (push) Successful in 1m48s
Details 
避免签名 URL 超长写库；新增包裹状态汇总；OrderBatchJobCoordinator 注入 IFileStorage 后补齐单测。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-12 12:30:35 +08:00
zzh
40997f7d71 feat: 新增 /file-storage/stream 供面单预览鉴权读取
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 19:14:26 +08:00
zzh
d1d31fee8a fix: 仓储图片上传支持 customerId，9610 明细补并发戳且主从安全
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details 
上传接口接受 query customerId；ConcurrencyStamp 默认改为空串并用主键确定性回填，避免 Galera UUID unsafe。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-11 12:09:36 +08:00
xiaolipro
d1e3672808 feat：cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m47s
Details
2026-09-11 11:34:59 +08:00
xiaolipro
56c18c0343 feat：加强cos log
All checks were successful
Build and Deploy / deploy (push) Successful in 1m41s
Details
2026-09-10 18:00:18 +08:00
xiaolipro
943ba539a4 feat: cos
All checks were successful
Build and Deploy / deploy (push) Successful in 1m43s
Details
2026-09-10 17:32:49 +08:00
xiaolipro
23eb80931a Merge remote-tracking branch 'prod/master' 2026-09-09 15:52:35 +08:00