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

102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzh
07fc7fffe7 feat: resolve createBy/updateBy to RBAC user display names 
Add OmsRbacUserDisplayNameResolver and use it in customer, order, warehouse, and channel APIs so audit fields return names instead of mapIds.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 19:07:17 +08:00
zzh
e875f0c012 feat: price-check by cargo type and warehouse, customer auto-code, track apiCode 
Support multi cargo-type and warehouse combinations in price check billing. Auto-generate customer codes (W+yyMM+seq) on create/register; require email. Use order DownstreamSupplierCode as track UpsertSmallBag apiCode.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 18:40:10 +08:00
zzh
bc0bde72bc feat(track): return reproducible curl in UpsertSmallBag result 
Expose CurlCommand in SmallBagTrackUpsertResult so track sync dialog can show the exact curl used for the request.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 13:00:11 +08:00
zzh
3046f26837 fix(track): forward Authorization Bearer to UpsertSmallBag 
Track gateway requires the logged-in user JWT in addition to appKey/timestamp/sign headers. Capture token before async enqueue so background sync still works.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 12:53:28 +08:00
zzh
bd1288edc9 fix(track): send UpsertSmallBag auth via HTTP headers 
Track SignatureValidationFilter reads appKey/timestamp/sign from headers, not query. Reverts e642f08 query transport and aligns debug script.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 12:35:39 +08:00
zzh
eac7b84f6a feat(order): downstream createOrderOne API from order DB 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 12:29:06 +08:00
zzh
e642f089ba fix(track): UpsertSmallBag auth params in query, align sign helper 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 12:18:57 +08:00
zzh
545f0825f8 feat(order): 规则快照下游元数据、订单绑定字段与系统其他配置 
排货发布 enrich Providers 并确认渠道时写入 t_order 下游四字段；接入 itfx 元数据客户端；系统其他配置与小包轨迹 DB 配置；手动轨迹 UpsertSmallBag 接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 11:31:15 +08:00
zzh
fe30d071e6 feat(order): 修复列表状态筛选、收件国家名与小包轨迹同步 
改用仓储链式 Where 修复分页列表状态过滤失效；保存并返回 ConsigneeCountryName；预报成功后异步 UpsertSmallBag；仅草稿/已预报可删除。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 19:43:35 +08:00
zzh
095ad66717 feat(order): 增加 IsPaid 字段并修复列表状态筛选 
- t_order 新增 IsPaid，支付/出库以该字段判断；含迁移脚本

- 列表接口补充 productName、channelName

- 修复 BuildOrderPredicate 状态条件 SqlSugar 翻译丢失

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 19:13:15 +08:00
zzh
e7fd69b644 feat(order): 排货确认渠道与应付计费，出入库计费对齐设计 
- 预报/入库后按排货规则选服务渠道并写入渠道买价应付费用

- 排货发布快照 Providers 去除 CreateTime/UpdateTime

- 出库扫描扩展 OutboundRecord 字段与 ApplyShipBillingByWaybillAsync

- 服务渠道买价发布预览；按 ChargingStage 删除应付费用

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 16:44:04 +08:00
zzh
fdbdfa8124 20260627 2026-06-27 11:56:06 +08:00
zzh
d766343ffe feat(customer): account flow ledger, pay deduct balance, status counts 
Add t_customer_account_flow with list API, deduct balance on order pay, credit ledger on recharge approve, and GET /order/status-counts for tab badges.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 19:09:43 +08:00
zzh
82df5d1e79 feat(order): add order edit APIs, inbound lookup, and fee output 
Support order detail/weight/declaration updates, receivable and payable recalculation, inbound scan order lookup, receive billing overwrite, and OrderOutput feeList for my-orders drawer.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 17:30:41 +08:00
zzh
5e26de6ff3 feat: remove ChargingTime and bill receivables by weight stage 
Drop sell/buy price charging-time config; write receivable fees after forecast or receive chargeable weight, hook inbound billing, fix order list status filter, and add DB migration.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 16:24:53 +08:00
zzh
91ba6d5d59 fix: 计重进位快照兼容与 KPI 分区明细 Excel 导入 
- 发布规则快照反序列化合并 StartValue/EndValue 至 Start/End
- 小包创建进位时快照区间无效则降级读 t_weight_rounding_info
- 新增 KPI 分区明细导入模板下载与 Excel 批量导入接口
- 补充快照进位与导入相关单元测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 15:29:17 +08:00
zzh
7827b4803e feat: slim rules/price publish snapshots with PostcodeRange (left,right] 
Use slim DTOs without audit timestamps; migrate legacy LeftPostcode/RightPostcode on read.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 14:10:34 +08:00
zzh
d8a98fbbc8 feat: 规则发布预览接口并抽取快照组装逻辑 
新增 GET publish/preview 返回含黑名单/偏远/计重/进位明细的完整 rules 快照，便于核对 Content。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 13:48:07 +08:00
zzh
2c69e8e5b8 feat: 规则快照固化计重/分区规则并修正卖价公式 
规则发布写入黑名单、偏远、计重规则与进位明细；查价/下单优先读快照。修正 unit/total/continue 算价及续单价相邻档位总价基数。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 12:57:34 +08:00
zzh
8aa6ceb677 fix: 价格发布从卖价明细分区推断 PriceAreaId 并写入快照 
产品未配置 PriceAreaId 时，根据卖价明细「分区」值匹配 t_kpi_area 或 t_kpi_area_info 后固化 PriceAreaInfos。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 11:58:01 +08:00
zzh
3a65e8c58f feat: 价格发布快照固化分区规则，查价优先从快照匹配不再查库 
发布/LIVE 快照写入 PriceAreaId、PriceAreaInfos；US+06000 命中分区键 3 单测通过。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 11:20:33 +08:00
zzh
cd061aaaed fix: 查价失败原因按价格项细化，指出分区/重量等具体不匹配项 
新增 ExplainQuotePriceMiss 逐条说明运费/操作费等未命中原因；zone 失败时附带卖价明细分区。单元测试 6/6 通过。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 10:49:08 +08:00
zzh
94a503afb3 fix: 查价分区键从国家+邮编解析，移除默认分区兜底 
PriceAreaId 优先取产品表并从规则快照回退；未命中 t_kpi_area_info 时在 zone 步骤返回明确原因，避免与卖价明细分区键不匹配。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 10:31:52 +08:00
zzh
148caae1e7 查价增强与小包国家码：查价忽略收费时机，支持 unit/total 字典公式与重量左开右闭区间，未命中返回 failures 步骤与原因；收发件人 countryCode 改为 ISO 二字码。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-26 09:57:14 +08:00
zzh
13ccd198d5 修复创建订单报错 2026-06-25 19:59:06 +08:00
zzh
b7ed14d6af 修复订单隔离和查价 2026-06-25 19:39:07 +08:00
zzh
00835bfadd 修复充值和查价 2026-06-25 19:10:44 +08:00
zzh
12ee25ad57 build 2026-06-25 17:47:46 +08:00
zzh
f18dd7a470 修复充值 2026-06-25 12:14:59 +08:00
zzh
1c5a38ad73 微信登录和创建应收和应付费用 2026-06-24 17:00:35 +08:00
xiaolipro
c1219e0238 ok 2026-06-10 17:57:43 +08:00
xiaolipro
dab31a7c8f fix：audit 2026-06-10 10:30:41 +08:00
xiaolipro
73d4d112a2 1 2026-06-09 15:37:56 +08:00
xiaolipro
20b95da384 1 2026-06-09 15:37:52 +08:00
xiaolipro
96724376a6 feat: new 2026-04-29 09:38:07 +08:00
xiaolipro
6458ab89ba fix 2026-04-22 17:48:05 +08:00
xiaolipro
22bb8ab425 ai-fix 2026-04-21 17:54:52 +08:00
xiaolipro
4fa45b6944 ai-fix：proxy https police？ 2026-04-17 11:25:50 +08:00
xiaolipro
2e65ea4ee7 feat：remarks 2026-04-17 11:09:01 +08:00
xiaolipro
829af8c576 upgrade 2026-04-16 17:22:58 +08:00
xiaolipro
a4e73283af append 2026-04-15 17:05:30 +08:00
xiaolipro
b912c5b159 feat: remarks 2026-04-15 16:50:57 +08:00
xiaolipro
91a8ccdecb ai-init 2026-04-15 15:25:38 +08:00
xiaolipro
b1520cfebf feat: add consul kv 2026-03-20 15:48:22 +08:00
xiaolipro
85627807eb add fei shu 2026-03-20 15:42:08 +08:00
xiaolipro
d242518040 Merge remote-tracking branch 'origin/master' 2026-03-20 15:40:37 +08:00
xiaoliutral
2572d1a202
Update Dockerfile path in CI workflow 2026-03-20 15:40:53 +08:00
xiaolipro
5b8fa4a577 move 2026-03-20 15:40:25 +08:00
xiaoliutral
9e5f938185
Update master.yml 2026-03-20 15:37:14 +08:00
xiaoliutral
1128e2a484
Add CI/CD pipeline configuration for deployment 2026-03-20 15:29:29 +08:00