1.06 #10

Merged

zzh merged 18 commits from test into master 2026-10-19 17:03:15 +08:00

Conversation 0 Commits 18 Files Changed 80 +3057 -1269

zzh commented 2026-10-19 17:03:05 +08:00

Owner

Copy Link

No description provided.

zzh added 18 commits 2026-10-19 17:03:05 +08:00

Merge remote-tracking branch 'prod/test' into test a9b15a2b5c

fix: 公告列表用 mapId 解析当前用户，管理端可查全部 ... c6e765e6e2

同步监控 overview 支持日周月经营指标与积压队列。

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: 公告广播可见性改为反序列化判定，避免 JSON 列比较失败 ... 7a0affe2d4

ReceiverIds 改为 text 存储并补充迁移；广播对客户/收件箱可见。

Co-authored-by: Cursor <cursoragent@cursor.com>

优化order/parcel/create d72637e472

升级包 b6f0d3ac13

Merge remote-tracking branch 'prod/test' into test 1540a74d52

fix: TikTok 拉单补齐 shop_cipher 与官方签名，并按状态翻页 ... 5afd204d36

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 国家地区支持增删改与导入，列表返回创建和更新时间 ... 8f64bbf02d

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: TikTok 重新获取面单改为按包裹下载发货文档 ... a1a7524a0e

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: TikTok 拉单按订单详情映射收件人金额行商品并落库 ... 9c97a218ec

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: TikTok 准备发货改为真实 shipPackage，并回写面单状态 ... 7a611f8cf7

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 店铺订单落库物流商与履约类型，并规范迁移脚本日期命名 ... 983dff12c5

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: 订单支付时选券，新增支付预览接口并按所选券扣款核销 ... 223d32f62a

- 新增 GET /order/pay-preview：返回会员折/券互斥后的应付拆解与本单可选券
- POST /order/pay 支持 couponInstanceId（null 沿用已绑定券，0 不用券，>0 指定券），按试算应付扣款并核销券、释放被替换券的锁定
- 被当前订单锁定的券视为可用，修复入库/编辑重算营销金额时误报券被占用

Co-authored-by: Cursor <cursoragent@cursor.com>

upgrade 29 4418217b01

Merge remote-tracking branch 'prod/test' into test ce75fca721

feat: 支付用券/会员折扣写入负数应收行，订单应收与实付一致 ... d38963055b

- 支付成功后写入 coupon_discount / member_discount 负数应收（币种、阶段跟随运费行，记录券码/会员等级）
- 营销重算的折前应收排除抵扣行，避免重复扣减；规则公式忽略抵扣行
- 预报/入库计费任务跳过已付款订单，防止重复投递冲掉应收
- 手工新增费用禁止抵扣费用项；费用输出给出抵扣行显示名
- 订单详情返回折前小计、会员折扣、优惠券抵扣、客户实付
- 新增 fee_item 字典迁移 migrate_fee_item_marketing_discount_20261019.sql

feat: 申报明细新增产品标识编码/非标产品标识编码/标准产品标识编码 ... 314c5ac02f

- t_order_declaration 新增 ProductId、NonStdProductId、StdProductId（迁移 migrate_order_declaration_product_ids_20261019.sql）
- 下单/改单/开放接口/Excel 模板入参、订单详情出参、下游 createOrderOne 报文同步字段
- 自动触发公式目录增加三个字段

feat: 9610 支持从已有运单批量创建汇总申报单 ... e931606a75

- 新增 POST /order/customs-9610/create-from-orders：运单设为 9610Summary 并绑定出口资质备案（空则客户默认），按申报明细生成待申报单
- 逐单返回结果：已删除、已有 9610 单、无申报明细、无可用备案记为失败，不影响其它运单

zzh merged commit 34d46ed492 into master 2026-10-19 17:03:15 +08:00

zzh referenced this issue from a commit 2026-10-19 17:03:16 +08:00

Merge pull request '1.06' (#10) from test into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ideship/admin#10

No description provided.