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

57 Commits

Author SHA1 Message Date
zzh
7ed8fd8e8a feat: 店铺创建运单支持基本信息覆盖，无事务时同步执行创单副作用
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 11:23:15 +08:00
zzh
d38963055b feat: 支付用券/会员折扣写入负数应收行，订单应收与实付一致 
- 支付成功后写入 coupon_discount / member_discount 负数应收（币种、阶段跟随运费行，记录券码/会员等级）
- 营销重算的折前应收排除抵扣行，避免重复扣减；规则公式忽略抵扣行
- 预报/入库计费任务跳过已付款订单，防止重复投递冲掉应收
- 手工新增费用禁止抵扣费用项；费用输出给出抵扣行显示名
- 订单详情返回折前小计、会员折扣、优惠券抵扣、客户实付
- 新增 fee_item 字典迁移 migrate_fee_item_marketing_discount_20261019.sql
 2026-10-19 15:48:15 +08:00
zzh
223d32f62a feat: 订单支付时选券，新增支付预览接口并按所选券扣款核销
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
- 新增 GET /order/pay-preview：返回会员折/券互斥后的应付拆解与本单可选券
- POST /order/pay 支持 couponInstanceId（null 沿用已绑定券，0 不用券，>0 指定券），按试算应付扣款并核销券、释放被替换券的锁定
- 被当前订单锁定的券视为可用，修复入库/编辑重算营销金额时误报券被占用

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 14:01:00 +08:00
xiaolipro
d72637e472 优化order/parcel/create 2026-10-16 14:55:37 +08:00
zzh
aa4c4a28e6 fix: 排货后创建轨迹订单转发创单时的 Authorization
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
消费端没有登录态会导致轨迹网关 401；创单时写入预报任务再带到轨迹事件。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 09:23:15 +08:00
zzh
5fd25d479c fix: 去掉创单后置步骤表，轨迹订单改在排货成功后创建
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
Details 
回到创单提交后各自投递；并在下单接口注释同步与 MQ 步骤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 09:05:26 +08:00
zzh
34c47a3173 fix: 创单后置步骤随订单落库，提交后再单独执行
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
进程重启或事务回滚不再丢掉 9610、轨迹和揽收；排货完成后再补轨迹、面单和计费相关触发。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 20:07:51 +08:00
xiaolipro
7b69bbf207 test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m4s
Details
2026-10-14 17:07:35 +08:00
xiaolipro
586a6b6834 change 2026-10-10 16:41:28 +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
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
f063c99d1b feat: OpenAPI 增加轨迹/文件查询，创单按 clientNo 幂等 
客户 HMAC 通过后再查本客户订单；禁止下游面单，附件增加 POD。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 11:25:31 +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
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
ab63920e85 chore: 触发 CI 重新构建发布，部署 OrderTask 合并后的上传接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 12:55:08 +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
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
a9338a4b25 feat: 揽收订单与列表支持管理端按客户筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 12:41:20 +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
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
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
0a5bd75618 feat: 新增财务应收应付接口并补充 Swagger 接口名称 
- 新增 Finance 模块应收应付分页查询及订单费用联查

- 为 DataPerm、Xhs 等缺失接口补充中文 summary 接口名称

- 优化微信公众号验签 Swagger 命名并补充路由集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-04 12:15:15 +08:00
zzh
c442833d9c feat(数据权限): 实现 P1 后端 API、有效范围合并与订单列表集成 
- 新增 DataPerm 模块（配置 CRUD、模板、字段脱敏、变更/访问日志 API）及 SQL 脚本
- 订单列表/导出接入 EffectiveScopeBuilder 五维数据权限过滤
- 修复集成测试 JSON 反序列化与 RBAC 用户名解析；新增 DataPerm API 集成测试

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 10:27:37 +08:00
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
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
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
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
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
00835bfadd 修复充值和查价 2026-06-25 19:10:44 +08:00