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

71 Commits

Author SHA1 Message Date
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
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
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
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
b81432c0af feat: 查价结果返回销售产品说明 
OrderPriceCheck 输出增加 ProductDescription，供前端报价卡展示线路简要说明。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-05 16:14:16 +08:00
zzh
7e9a5d4ae0 feat: 用户资料支持企业微信客服接入链接 
新增 user.WecomKfUrl 存取与迁移脚本，顾问接口同步返回该字段。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-01 19:09:34 +08:00
zzh
a70f6f2a87 feat: 接入 9610 汇总申报，字段按业务含义命名并对齐运单 
含清单/报关单拉取、ITFX 转发配置、迁移脚本与拣货单号扩展。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 17:46:04 +08:00
zzh
78e06d01b9 feat: 工作台扩展代发/拣货统计与业务趋势接口 
补充 Fulfill/Pickup 工作台统计 DTO 与查询实现，并扩展订单工作台聚合输出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 10:59:10 +08:00
zzh
2018e45a7d feat: 代发进度统计、申报HS分列与异常事件表迁移脚本 
补充代发进度 Tab 计数、PrimarySkuCodes 与 Im/Ex HS 编码输出；新增 t_order_exception_event 幂等迁移（Handler*、ConcurrencyStamp）并同步 db.sql。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 17:06:16 +08:00
zzh
9d813a5f89 feat: 代发订单 FulfillmentType 与进度筛选、绑定拣货后端 
支持 direct/warehouse 分轨、代发进度与库位排序、国内单号检索及到仓关联订单；扩展 SKU/店铺代发与库存绑定扣减能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-20 10:27:37 +08:00
zzh
654a65aba4 feat: workplace claimed stats and receiver address parse improvements 
Add claimed count to workplace stats; refine receiver address parse DTOs/helpers and AI skill seed wiring.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-09 19:06:49 +08:00
zzh
95940331ce feat: sync workplace spend stats and consolidate schema scripts into db.sql 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-04 16:26:22 +08:00
zzh
9a33eb00a5 feat: add knowledge base M1 APIs and workplace spend trend 2026-08-04 13:54:10 +08:00
zzh
b2355104cf feat: 完善揽收单与问题件处理能力 
补齐揽收单字段/并发戳与问题件处理人配置，扩展异常工作流与下单同步揽收出参；移除已收货状态并补充相关 SQL 脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-04 11:49:23 +08:00
zzh
c02cb21049 feat: add pickup-order model and door-pickup linking 
Support 1 pickup to N logistics orders with create/pay/schedule APIs, parcel inboundMethod auto-attach, plus allocation-trace and inbound-billing updates already in tree.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-03 12:22:30 +08:00
zzh
c8107cb565 feat: add additional-service billing, conditions, and fee lifecycle hardening 
Support optional services and executable billing conditions on sell/buy prices, percent-of-value and percent-of-freight formulas, place-order/inbound payable on chargeable weight, outbound receivable freeze, channel remote areas, billing simulate, and insurance-aware claims.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-01 18:04:28 +08:00
zzh
a55668ec33 feat: 订单列表表头筛选、远程排序与默认90天时间窗护栏 
支持 filters[]/whitelist 排序，导出行数与批量 IN 上限，无时间窗时兜底近90天。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 11:25:31 +08:00
zzh
238eb5d817 feat: 新增收件地址 AI 解析接口 
支持 /order/receiver/parse-address，供 PC/H5 下单地址解析使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-30 20:09:42 +08:00
zzh
e0216e9692 feat: 销售产品贸易条款与查价分组展示，并修复用户资料 SQL 空值写入 
查价返回 DDP/DDU 与产品分组；用户更新微信二维码时避免 EF 使用 DBNull。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-30 11:48:36 +08:00
zzh
53c986c746 fix: 修复智谱 AI 对话 URL，并合并自动触发预报时机 
XhsLlmClient 对 /v4 基址不再错误拼接 /v1；自动触发「预报」归一为「下单」并补充迁移 SQL；下单失败支持存草稿相关入参与计费回滚调整。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 20:54:28 +08:00
zzh
41f4c58e99 Improve draft predeclare billing and structured create-fail payload. 
Re-run forecast billing on draft pre-declare, and expose draftSaved/orderId/serviceNo via ErrorCode/Data/details for clearer place-order failure UX.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 19:30:27 +08:00
zzh
03f11a276f Add order attachment files table and move system labels off Order. 
Persist generated/printed/downstream labels in t_order_file, drop Order.LabelUrl generate-status fields, and expose file list/upload/delete APIs with customer read-only systemLabel access.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 16:32:55 +08:00
zzh
6f436f795f Fix downstream forecast success detection and persist provider service no. 
Treat itfx body code/msg as business result, store full request/response, and write Data.serviceNo/trackNo back to the order.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 10:21:23 +08:00
zzh
89233bc3da feat: add customer marketing module (M1-M6 backend) 
Implement referral, points, coupons, commission, member levels, and order integration with migration SQL and background jobs.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 16:42:08 +08:00
zzh
e2dca20966 fix: strip audit fields from channel price publish snapshots 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 11:55:21 +08:00
zzh
3d5eaa223a feat: 小包全链路加固、待排货与运单号 IDE 前缀 
查价/下单/入库/出库统一校验与计费上下文；待排货状态及可选入库排货；运单号改为 IDE+yyMMddHHmmss；补充迁移 SQL 与测试修复。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 19:00:55 +08:00
zzh
a1daea6b35 refactor: 仓储表 C_* 改为 c_*，优化专线小包批量模板 
- 仓储实体与 db.sql 统一为小写 c_ 前缀，新增 migrate_rename_warehouse_C_to_c.sql
- 专线小包批量模板精简版/标准版双模板，Excel 必填标红与发件地址上传参数

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 16:18:59 +08:00
zzh
bb09a51f4a refactor: 合并 OrderTask 至批量任务，移除 t_order_task 依赖 
Excel 导入与任务进度统一走 t_order_batch_job；删除旧实体、仓储与 /order/task/* 接口，上传返回 jobId。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:36:57 +08:00
zzh
377cc525d6 feat: 增强批量任务子项反馈与客户单号持久化 
统一成功/失败结果快照，补全客户单号与 Excel 行号；系统重试耗尽后标记失败避免子项长期停留在执行中；任务 API 返回 pending/running/cancelled 计数。
 2026-07-22 12:00:53 +08:00
zzh
188aed1ee6 feat: 店铺订单创建物流/代发，并补齐收件人字段与种子数据 
- 新增 batch-create-logistics / batch-create-fulfill：按平台行建物流单并回写 LinkedOrderId，代发支持绑定冻结与失败回滚
- ParcelBuilder 支持无 SKU 映射的平台行申报；批量创建可指定 OrderSource=platform
- 库存绑定候选接口支持 orderId=0 草稿选仓
- 店铺订单增加结构化收件人字段（db.sql + 迁移脚本），拉单回填；补充 customer9 店铺/揽收种子与 ConcurrencyStamp 修复脚本

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-19 22:33:55 +08:00
zzh
b679151eb1 feat: Hiprint模板转QuestPDF异步出面单，并接通打印链路 
支持模板预览/字段字典、产品绑定 LabelTemplateId、订单 Pending→Ready 生成 PDF，以及 order/print、批量与仓内 printUrl。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 14:52:39 +08:00
zzh
f4ddd993b9 feat: 管理端列表返回客户名称/编码，并加固绑定与客户会话 
订单/包裹/库存/店铺授权/店铺订单列表补充 customerName、customerCode；库存绑定按会话客户解析并兼容可用量；修复客户 mapId 识别与 ConcurrencyStamp 迁移。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 11:10:53 +08:00
zzh
dc3071c90d feat: 物流单绑定包裹/库存（冻结可用库存） 
支持我的订单对已创建物流单绑定仓储资源：新增 t_order_stock_bind 与 stock-bind API，库存/包裹增加 FrozenQty、AvailableQty。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 10:32:44 +08:00
zzh
fc823ed24e feat: 工作台统计补充店铺数量与待处理店铺订单，包裹单号前缀改为 ID 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-17 14:17:00 +08:00
zzh
a9338a4b25 feat: 揽收订单与列表支持管理端按客户筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 12:41:20 +08:00
zzh
1cf55b2669 fix: 地址簿管理端可查全部，修复 SqlSugar 条件翻译 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 12:30:30 +08:00
zzh
674cbdd011 feat: 店铺真授权跳转与地址类型（发件/退件/收件） 
对接 Lazada/Shopee/TikTok/Temu OAuth 与回调落库，移除手工店；地址管理支持按类型默认与揽收校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 10:25:13 +08:00
zzh
341a318f0b feat: 客户发件地址与揽收订单，复用小包创建全链路。 
新增地址簿 CRUD、pickup/create、订单 orderSource 筛选；附带包裹商品图片上传接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 18:58:48 +08:00
zzh
43563b727f feat: 自动触发公式引擎与查价运输方式分组接口 
实现中文公式预报前拦截、规则测试 API 及按销售产品分组返回查价运输方式选项。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 18:36:17 +08:00
zzh
d8752959e7 feat(order): 强化小包下单规则并暴露预报失败原因 
客户单号必填且同客户唯一，运单号统一 NE 前缀自动生成；模板导入不再接受跟踪号/运单号；列表与导出返回预报失败原因字段。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 09:44:12 +08:00
zzh
7d5bc2408f fix(order): 批量导入回写订单 ID 并增强 Excel 表头映射匹配 
导入行成功后写入 batch job 的 orderId/serviceNo；预报失败时尽量关联草稿订单。Excel 读取与行映射支持表头归一化，兼容带括号说明的列名。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:34:59 +08:00
zzh
fc22d9c6c6 feat(order): 优化标准模板 Excel 生成并支持保存映射时选择标准模板 
标准模板仅保留中文表头、必填标黄与枚举下拉；导入起始行改为第2行；保存自定义映射时可指定 standardTemplateKey。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 17:23:19 +08:00
zzh
9ab112a36e feat(order): 下单模板映射与 Excel 批量导入小包创建 
新增专线小包标准模板生成、自定义列映射 API，并将 /order/upload 改为按映射解析 Excel 后走 CreateParcelCoreAsync；列表查询时自动补齐标准模板种子数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 16:42:22 +08:00
zzh
4f3bbd17bc feat(order): 订单批量任务 RabbitMQ 异步处理与治理 API 
引入批量 Job 表、RabbitMQ 队列与消费者，支持导入/小包创建及我的订单批量操作异步化，并提供任务列表、重试失败、取消 pending 与 DLX 监控接口及测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 09:52:22 +08:00
zzh
dd5c82e523 feat(order): 支持订单详情手动添加费用项 
新增 OrderFeeAddInput 并在 OrderEdit 服务中实现费用追加逻辑，配合前端订单详情抽屉添加费用能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 12:36:18 +08:00
zzh
90f6c25b04 feat(order): 问题件/理赔件标记、通知投递与自动触发 
新增 mark-problematic/mark-claimed/handle-status 接口，异常事件审计表与占位符渲染；inApp/email 通知及下单/入库/出库自动触发运行时。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 16:46:52 +08:00
zzh
cde0ccb6b0 feat: 新增工作台与实时监控统计 API 
- GET /order/workplace-stats 与 /order/workplace-trend 供工作台使用

- GET /monitor/overview 供实时监控页订单/客户/轨迹统计

- 扩展订单仓储聚合查询，status-counts 同步应用数据权限

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 18:24:48 +08:00
zzh
1c0dce9956 fix: 查价运费匹配与费用公式展示优化 
修复卖价明细英文货物类型无法匹配导致 freight 为 0 的问题；查价返回算法算式、其他费用明细及中文货物属性名；运费列仅汇总 freight 费用项。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 19:25:33 +08:00