- 新增 shopAreaSync:按账号拉一次商家列表(同账号多店铺共享,PageSize=200 翻页),
把最新商家结构(FxUserId、分区声明 DbAreas)写回 shops.external_data;
商家已不在合作列表时自动把店铺置为禁用,并写明原因
- 手动刷新入口:POST /api/shops/{id}/refresh-area(货主权限)、
POST /api/external-print-accounts/{id}/refresh-shops-area(集团权限)
- 新增定时任务 refreshExternalShopAreas:每小时巡检,按账号 6 小时刷新一次
(DGJ_AREA_REFRESH_HOURS 可调),自动禁用店铺后不再参与自动拉单与一键拉单
- 新增 shopOrderGuard:店铺禁用立即作废该店铺待审核订单
(void_reason 前缀「店铺已禁用,暂停处理」),重新启用时只恢复因此暂停的订单;
禁用店铺再拉单直接拒绝,避免又拉回待审核单
- externalPrintOrder 待审核单核对改用 LogicOrderId 批量回读(50 单/批,最多 300 单)
- orderStatus.restore 支持显式 principalId,供无登录态的系统任务调用
- 前端:店铺列表新增「所在区」列与行内/详情「刷新所在区」按钮,
系统自动禁用的店铺状态带原因提示,启停与刷新后提示作废/恢复了多少订单
- 文档:新增 §4.2.2「所在区」刷新、§4.2.3 店铺禁用/启用与待审核订单
(原 LastWaybillCode 小节顺延为 §4.2.4,WMS 对接文档引用同步)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
168 lines
6.1 KiB
JavaScript
168 lines
6.1 KiB
JavaScript
'use strict';
|
||
|
||
const Service = require('egg').Service;
|
||
|
||
/**
|
||
* 因店铺禁用而写入的作废原因前缀。
|
||
* 店铺重新启用时只按此前缀找回「被暂停」的订单,避免把平台已发货等其它原因作废的单恢复回来。
|
||
*/
|
||
const DISABLED_VOID_REASON_PREFIX = '店铺已禁用,暂停处理';
|
||
|
||
/** 单次流转的订单条数(避免一次 IN / 事务过大) */
|
||
const BATCH_SIZE = 200;
|
||
|
||
/**
|
||
* 店铺禁用 / 启用时的待审核订单守卫
|
||
*
|
||
* 店铺禁用后无法再取号(平台账号或商家已不可用),留在「待审核」的订单一旦被审核/取号就会报错,
|
||
* 因此:
|
||
* 1. 禁用 → 立即把该店铺的待审核订单作废(备注写明原因,可追溯);
|
||
* 2. 启用 → 把**因禁用被作废**的订单恢复回待审核(按 void_reason 前缀识别,不影响其它作废单)。
|
||
*
|
||
* 只处理 `pending → void`,已审核(待推送/委外中/配送)的订单不动:那些单据的库存与仓库动作已发生。
|
||
*/
|
||
class ShopOrderGuardService extends Service {
|
||
/**
|
||
* 店铺禁用后作废其待审核订单
|
||
* @param {Object} shop 店铺实例(或含 id/name/code/principal_id 的普通对象)
|
||
* @param {Object} [options] 选项
|
||
* @param {string} [options.reason] 自定义作废原因(默认按店铺生成)
|
||
* @return {Promise<{count: number}>} 作废数量
|
||
*/
|
||
async voidPendingOrders(shop, options = {}) {
|
||
const { ctx } = this;
|
||
const pendingModel = ctx.model.OrderStatusPending;
|
||
if (!pendingModel) return { count: 0 };
|
||
|
||
const rows = await pendingModel.findAll({
|
||
where: { principal_id: shop.principal_id, shop_id: shop.id },
|
||
attributes: [ 'id', 'order_no' ],
|
||
raw: true,
|
||
});
|
||
if (!rows.length) return { count: 0 };
|
||
|
||
const reason = options.reason || `${DISABLED_VOID_REASON_PREFIX}(店铺「${shopName(shop)}」禁用后无法取号;重新启用后自动恢复)`;
|
||
const moved = await this.runFlow(rows, async ids => {
|
||
return await ctx.service.orderStatus.voidOrder({
|
||
ids,
|
||
void_reason: reason,
|
||
principalId: shop.principal_id,
|
||
});
|
||
});
|
||
|
||
await ctx.service.operationLog.recordMany(
|
||
(moved.length ? moved : rows).map(row => ({
|
||
principalId: shop.principal_id,
|
||
targetType: 'order',
|
||
targetId: Number(row.id),
|
||
action: 'void',
|
||
title: `店铺禁用作废:${row.order_no || row.id}`,
|
||
detail: { reason, shop_id: Number(shop.id), shop_name: shopName(shop) },
|
||
})),
|
||
{ source: 'system' }
|
||
);
|
||
|
||
this.ctx.logger.warn('[shopOrderGuard] 店铺 %s 已禁用,作废待审核订单 %d 单', shop.id, moved.length);
|
||
return { count: moved.length };
|
||
}
|
||
|
||
/**
|
||
* 店铺重新启用后恢复「因禁用被作废」的订单
|
||
* @param {Object} shop 店铺实例
|
||
* @return {Promise<{count: number}>} 恢复数量
|
||
*/
|
||
async restorePendingOrders(shop) {
|
||
const { ctx } = this;
|
||
const Op = ctx.app.Sequelize.Op;
|
||
const voidModel = ctx.model.OrderStatusVoid;
|
||
if (!voidModel) return { count: 0 };
|
||
|
||
const rows = await voidModel.findAll({
|
||
where: {
|
||
principal_id: shop.principal_id,
|
||
shop_id: shop.id,
|
||
void_reason: { [Op.like]: `${DISABLED_VOID_REASON_PREFIX}%` },
|
||
},
|
||
attributes: [ 'id', 'order_no' ],
|
||
raw: true,
|
||
});
|
||
if (!rows.length) return { count: 0 };
|
||
|
||
const moved = await this.runFlow(rows, async ids => {
|
||
return await ctx.service.orderStatus.restore({ ids, principalId: shop.principal_id });
|
||
});
|
||
|
||
await ctx.service.operationLog.recordMany(
|
||
(moved.length ? moved : rows).map(row => ({
|
||
principalId: shop.principal_id,
|
||
targetType: 'order',
|
||
targetId: Number(row.id),
|
||
action: 'restore',
|
||
title: `店铺启用恢复:${row.order_no || row.id}`,
|
||
detail: { shop_id: Number(shop.id), shop_name: shopName(shop) },
|
||
})),
|
||
{ source: 'system' }
|
||
);
|
||
|
||
ctx.logger.info('[shopOrderGuard] 店铺 %s 已启用,恢复待审核订单 %d 单', shop.id, moved.length);
|
||
return { count: moved.length };
|
||
}
|
||
|
||
/**
|
||
* 分批执行状态流转;某批里有单据状态已变(如刚好被人工审核)时降级为逐单执行,
|
||
* 避免个别单据阻塞整批。
|
||
* @param {Array} rows 待流转的订单行(需含 id / order_no)
|
||
* @param {Function} flow 流转函数:ids → { count, items }
|
||
* @return {Promise<Array<{id: number, order_no: string}>>} 实际流转成功的订单
|
||
*/
|
||
async runFlow(rows, flow) {
|
||
const succeeded = [];
|
||
for (const chunk of chunksOf(rows, BATCH_SIZE)) {
|
||
try {
|
||
const result = await flow(chunk.map(row => Number(row.id)));
|
||
const items = Array.isArray(result && result.items) ? result.items : [];
|
||
if (items.length) {
|
||
succeeded.push(...items.map(item => ({ id: Number(item.id), order_no: item.order_no })));
|
||
} else {
|
||
succeeded.push(...chunk);
|
||
}
|
||
} catch (err) {
|
||
this.ctx.logger.warn('[shopOrderGuard] 批量流转失败,改为逐单处理:%s', err.message);
|
||
for (const row of chunk) {
|
||
try {
|
||
const result = await flow([ Number(row.id) ]);
|
||
const item = result && Array.isArray(result.items) ? result.items[0] : null;
|
||
succeeded.push(item ? { id: Number(item.id), order_no: item.order_no } : row);
|
||
} catch (singleErr) {
|
||
this.ctx.logger.warn('[shopOrderGuard] 订单 %s 流转失败:%s', row.order_no || row.id, singleErr.message);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
return succeeded;
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 店铺展示名(备注里用,缺名称时退回编码 / ID)
|
||
* @param {Object} shop 店铺实例
|
||
* @return {string} 展示名
|
||
*/
|
||
function shopName(shop) {
|
||
return String((shop && (shop.name || shop.code)) || (shop && shop.id) || '').slice(0, 50);
|
||
}
|
||
|
||
/**
|
||
* 按固定大小切分数组
|
||
* @param {Array} list 原数组
|
||
* @param {number} size 每段大小
|
||
* @return {Array<Array>} 分段结果
|
||
*/
|
||
function chunksOf(list, size) {
|
||
const chunks = [];
|
||
for (let i = 0; i < list.length; i += size) chunks.push(list.slice(i, i + size));
|
||
return chunks;
|
||
}
|
||
|
||
module.exports = ShopOrderGuardService;
|