ming #1

Merged
liufumingren merged 558 commits from ming into main 2026-11-18 16:13:25 +08:00
Showing only changes of commit c727cd1c5c - Show all commits

View File

@ -2727,6 +2727,21 @@ class PendingOrderService extends OrderBaseService {
// 拦截标记已写入,提交后抛出业务错误(调用方按"已转拦截"处理)
await transaction.commit();
// 创建售后工单 + 通知快递群(失败不影响主流程,与 batchIntercept 口径一致)
try {
const op = this.getOrderLogOperator();
await this.ctx.service.systems.afterSale.createInterceptWorkOrdersAndNotify({
orderIds: syncedOrderIds,
warehouseId,
creatorLabel: (op && op.name) || '系统',
reason: '订单已同步,不可取消,转为拦截处理',
});
} catch (workOrderErr) {
this.ctx.logger.warn(
`[PendingOrderService.cancelOrder] 转拦截创建工单/通知失败, count=${syncedOrderIds.length}, error=${workOrderErr.message}`
);
}
// 写入拦截操作日志(不影响主流程)
try {
const operator = this.getOrderLogOperator() || {};