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

318 Commits

Author SHA1 Message Date
zzh
6021562fea feat: 入库预报支持预报/待入库编辑，唛头选填
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 18:54:33 +08:00
zzh
8a1649ea66 feat: 入库箱唛/SKU 标签打印与订单改销售产品
All checks were successful
Build and Deploy / deploy (push) Successful in 1m13s
Details 
支持按 box/sku 模板生成 PDF；待支付前可改产品并自动重排货重算费。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 18:39:07 +08:00
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
264c3a5dcb fix: 编辑订单跟踪号改为同步 Upsert，不再发 Outbox 事件
All checks were successful
Build and Deploy / deploy (push) Successful in 1m28s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 10:56:28 +08:00
zzh
45361e9eb5 fix: /order/update 加事务 UoW，跟踪号变更可写 Outbox
Some checks failed
Build and Deploy / deploy (push) Failing after 58s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 10:49:12 +08:00
zzh
e931606a75 feat: 9610 支持从已有运单批量创建汇总申报单
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
- 新增 POST /order/customs-9610/create-from-orders：运单设为 9610Summary 并绑定出口资质备案（空则客户默认），按申报明细生成待申报单
- 逐单返回结果：已删除、已有 9610 单、无申报明细、无可用备案记为失败，不影响其它运单
 2026-10-19 16:24:02 +08:00
zzh
314c5ac02f feat: 申报明细新增产品标识编码/非标产品标识编码/标准产品标识编码
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details 
- t_order_declaration 新增 ProductId、NonStdProductId、StdProductId（迁移 migrate_order_declaration_product_ids_20261019.sql）
- 下单/改单/开放接口/Excel 模板入参、订单详情出参、下游 createOrderOne 报文同步字段
- 自动触发公式目录增加三个字段
 2026-10-19 15:48:16 +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
xiaolipro
ce75fca721 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m5s
Details
2026-10-19 15:08:16 +08:00
xiaolipro
4418217b01 upgrade 29 2026-10-19 15:08:05 +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
zzh
983dff12c5 feat: 店铺订单落库物流商与履约类型，并规范迁移脚本日期命名
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 18:01:46 +08:00
zzh
7a611f8cf7 fix: TikTok 准备发货改为真实 shipPackage，并回写面单状态
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 17:31:19 +08:00
zzh
9c97a218ec fix: TikTok 拉单按订单详情映射收件人金额行商品并落库
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:59:28 +08:00
zzh
a1a7524a0e fix: TikTok 重新获取面单改为按包裹下载发货文档
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:15:51 +08:00
zzh
8f64bbf02d feat: 国家地区支持增删改与导入，列表返回创建和更新时间
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 15:54:22 +08:00
zzh
5afd204d36 fix: TikTok 拉单补齐 shop_cipher 与官方签名，并按状态翻页
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 15:18:22 +08:00
xiaolipro
1540a74d52 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m3s
Details
2026-10-16 14:59:30 +08:00
xiaolipro
d72637e472 优化order/parcel/create 2026-10-16 14:55:37 +08:00
zzh
7a0affe2d4 fix: 公告广播可见性改为反序列化判定，避免 JSON 列比较失败
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
ReceiverIds 改为 text 存储并补充迁移；广播对客户/收件箱可见。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 09:57:25 +08:00
zzh
c6e765e6e2 fix: 公告列表用 mapId 解析当前用户，管理端可查全部
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
同步监控 overview 支持日周月经营指标与积压队列。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 09:48:42 +08:00
zzh
66d383160f fix: 应收应付「仅当前生效阶段」列表金额为 0
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
SqlSugar 在同一查询上 Select 后再分页会沿用投影列，导致 Amount/Currency 丢失；候选筛选与最终全字段查询拆开。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 20:11:46 +08:00
zzh
8258ae746e feat: 客户更新接口支持局部字段，并补充开发/SQL 规范说明
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 19:53:24 +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
a30958843b fix: 首次创建轨迹订单无跟踪号时用客户单号占位
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
轨迹侧 TrackNo 必填，后续有真实跟踪号再 Upsert 更新。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 09:14:52 +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
zzh
61b6f9a9b9 fix: 创单事务释放后再提交 9610、轨迹和揽收事件
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
避免在创单事务里写 Outbox 征用不到连接，导致这三类事件被丢掉。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 19:37:56 +08:00
zzh
79fa20a9ca fix: 创单成功后把预报计费和后续事件拆开提交
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
预报计费失败不再把订单留在处理中，轨迹、面单和自动触发在创单提交后各自入队。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 19:23:07 +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
a1d2dece57 Merge remote-tracking branch 'prod/test' into test
All checks were successful
Build and Deploy / deploy (push) Successful in 1m7s
Details
2026-10-14 16:41:31 +08:00
xiaolipro
38d36eb812 升级 2026-10-14 16:40:31 +08:00
zzh
b7be742046 feat: 店铺订单支持仓储代发(wms)建单，放宽创建状态限制
All checks were successful
Build and Deploy / deploy (push) Successful in 4m34s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 15:39:31 +08:00
zzh
e85dfb80b5 feat: 仓配开放 API 与后台用户启停
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
新增 warehouseOpenApi（Token/入库/件重尺/红外图），并在 fk_user 支持 IsEnabled 禁用登录。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 17:53:00 +08:00
xiaolipro
ff9c589956 fix
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details
2026-10-13 17:20:12 +08:00
xiaolipro
8cfff8ef81 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 6s
Details
2026-10-13 16:46:12 +08:00
xiaolipro
09ca1c96d7 fix
Some checks failed
Build and Deploy / deploy (push) Failing after 15s
Details
2026-10-13 16:25:22 +08:00
xiaolipro
551ac09f78 feat：升级框架总线
All checks were successful
Build and Deploy / deploy (push) Successful in 1m6s
Details
2026-10-13 15:20:53 +08:00
zzh
d5d6305f9c feat: 自动触发规则支持 Excel 导入与模板下载
All checks were successful
Build and Deploy / deploy (push) Successful in 1m2s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 15:31:19 +08:00
zzh
32156dcfe0 fix: 轨迹订单 trackNo 仅取跟踪号，变更后重新 Upsert
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:20:09 +08:00
zzh
fa9777bd08 fix: SqlSugar 与 EF Outbox 连接冲突时回落短事务
All checks were successful
Build and Deploy / deploy (push) Successful in 59s
Details 
发布集成事件前先挂 Outbox 上下文；连接不匹配时 RequiresNew 写 Outbox，避免预报等按钮报 transaction not associated。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 19:01:15 +08:00
zzh
6c3a094126 feat: 下游 getFile 转存 COS，并修复集成事件 Outbox 事务
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
新增获取下游文件接口；事件发布统一走事务性 UoW，避免批量预报等按钮报 Outbox 错误。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 18:45:40 +08:00
xiaolipro
957ea62f70 Merge pull request '1.03' (#4) from mq into test
Some checks failed
Build and Deploy / deploy (push) Has been cancelled
Details 
Reviewed-on: #4
 2026-10-10 16:46:05 +08:00
xiaolipro
586a6b6834 change 2026-10-10 16:41:28 +08:00
zzh
8df0f37165 feat: 订单编辑支持服务商单号并完善操作日志快照
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
开放 DownstreamServiceNo 更新，补充包裹计费相关操作码与字段快照，便于运单详情编辑留痕。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 16:27:49 +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
da27fa4377 feat: 重算应付放行锁渠道池校验，支持切换价格/规则版本与服务商名称
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 18:16:38 +08:00
zzh
2b0158acb4 feat: 运单操作日志 MVP，记录编辑/件重尺/重算/排货字段变更
All checks were successful
Build and Deploy / deploy (push) Successful in 1m0s
Details 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 17:32:33 +08:00
zzh
358738c333 feat: 揽收单支持改信息/件重尺/重算费用，创建后自动预报下游
All checks were successful
Build and Deploy / deploy (push) Successful in 1m1s
Details 
创建成功后自动下游预报回写承运单号并升为已预约；详情可改揽收信息与件重尺并按卖买价重算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 16:12:12 +08:00