feat(order): 新增 order.convertToB2b 接口,订单转 B2B

- systems/order_b2b.js convertOrdersToB2b:
  1) 仅限待处理表(current 分表)订单,事务内 SELECT ... FOR UPDATE 后逐行校验:
     待处理(step!=0)/未打印(print_status!=fin)/未锁定(lock_status=none)/
     未拦截(intercept_status=none)/未转 B2B(is_b2b!=Y),不符合条件跳过
     (skipped_reasons 返回原因),不存在的订单计入 not_found_order_ids
  2) 事务内:订单 is_b2b 置 Y + wms_order_b2b 写入(findOrCreate by uk_order_id,
     已存在不覆盖);提交后写操作日志 ORDER_B2B_CONVERT(失败不影响主流程)
  3) 单次上限 200,仓库隔离(warehouse_id 过滤)
- systemMethods/order/index.js convertToB2b:ids/order_ids/orderIds 数组
  与 id/order_id/orderId 单值兼容,空/超限 400;白名单三处加 convertToB2b
- wms_order_b2b 新增 is_print 字段(ENUM('Y','N') 默认 N 未打印)+ idx_is_print
  (迁移 20261009100000 已执行开发库并核验 15 列)
- 验证:临时集成测试 3/3 PASS(转换落库+日志+还原、跳过分流、400 边界);
  ESLint 0 error;生产迁移待随发布执行
This commit is contained in:
liufumingren 2026-10-09 00:22:25 +08:00
parent 4223b6882a
commit 183e542d74
4 changed files with 295 additions and 3 deletions

View File

@ -70,6 +70,12 @@ module.exports = app => {
defaultValue: 'N',
comment: '是否提货:Y=已提货 N=未提货',
},
is_print: {
type: ENUM('Y', 'N'),
allowNull: false,
defaultValue: 'N',
comment: '是否打印:Y=已打印 N=未打印',
},
picked_up_at: {
type: DATE,
allowNull: true,
@ -120,6 +126,10 @@ module.exports = app => {
name: 'idx_is_picked_up',
fields: [ 'is_picked_up' ],
},
{
name: 'idx_is_print',
fields: [ 'is_print' ],
},
{
name: 'idx_deleted_at',
fields: [ 'deleted_at' ],

View File

@ -13,12 +13,59 @@ class OrderIndexService extends OrderBaseService {
constructor(ctx) {
super(ctx);
const _noNeedLogin = '';
const _noNeedRight = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill';
const _noNeedLog = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill';
const _noNeedAuth = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill';
const _noNeedRight = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill,convertToB2b';
const _noNeedLog = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill,convertToB2b';
const _noNeedAuth = 'list,badgeCount,manualOutboundOrder,queryOrderLogs,queryOrderLogList,detail,updateExpressWeighingWeight,export,exportTaskProgress,bindExpressPackageMaterialByWaybill,convertToB2b';
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
}
/**
* 订单转 B2B 订单。
*
* 仅限待处理表中未打印、未锁定、未拦截的订单;不符合条件跳过。
* 事务内:订单表 is_b2b 置 Y + 写入 wms_order_b2b 作业明细,提交后写操作日志。
*
* @param {Object} data 请求体。
* @param {Array<number|string>|number|string} [data.ids] 订单ID集合(优先)。
* @param {Array<number|string>|number|string} [data.order_ids] 订单ID集合别名。
* @param {Array<number|string>|number|string} [data.orderIds] 订单ID集合别名。
* @param {number|string} [data.id] 订单ID单值别名。
* @param {number|string} [data.order_id] 订单ID单值别名。
* @param {number|string} [data.orderId] 订单ID单值别名。
* @return {Promise<Object>} 统一成功包装响应(data 含 converted/skipped/not_found 分流结果)。
*/
async convertToB2b(data = {}) {
const requestData = this.isPlainObject(data) ? data : {};
const rawIds = requestData.ids !== undefined ? requestData.ids
: requestData.order_ids !== undefined ? requestData.order_ids
: requestData.orderIds !== undefined ? requestData.orderIds
: requestData.id !== undefined ? requestData.id
: requestData.order_id !== undefined ? requestData.order_id
: requestData.orderId;
const orderIds = [ ...new Set(
(Array.isArray(rawIds) ? rawIds : [ rawIds ])
.map(item => Number(item))
.filter(item => Number.isInteger(item) && item > 0)
) ];
if (orderIds.length === 0) {
return this.fail('订单ID不能为空', {}, 400);
}
if (orderIds.length > 200) {
return this.fail('单次最多转换 200 个订单', {}, 400);
}
const warehouseId = this.getWarehouseId();
const operator = this.getOrderLogOperator();
const result = await this.service.systems.orderB2b.convertOrdersToB2b({
warehouseId,
orderIds,
operator,
});
return this.success('ok', result);
}
/**
* 提交订单导出任务。
*

View File

@ -0,0 +1,204 @@
'use strict';
const Service = require('egg').Service;
/** 订单转 B2B 操作码 */
const ORDER_B2B_CONVERT_OPERATION_CODE = 'ORDER_B2B_CONVERT';
/** 单次转换订单数上限 */
const ORDER_B2B_CONVERT_BATCH_LIMIT = 200;
/**
* B2B 订单业务服务。
*
* 负责订单转 B2B(wms_order_delivery.is_b2b 置 Y + wms_order_b2b 作业明细落表)。
*/
class OrderB2bService extends Service {
/**
* 将待处理订单批量转为 B2B 订单。
*
* 仅限待处理表(current 分表)中未打印、未锁定、未拦截的订单;
* 不符合条件的订单跳过(计入 skipped),不报错。事务内完成
* is_b2b 置 Y 与 wms_order_b2b 明细写入;操作日志在事务提交后写入。
*
* @param {Object} params 转换参数。
* @param {number|string} params.warehouseId 仓库ID。
* @param {Array<number>} params.orderIds 订单ID数组。
* @param {Object|null} [params.operator=null] 操作人 { id, name }。
* @return {Promise<Object>} { converted_order_ids, converted_count, skipped_order_ids,
* skipped_count, skipped_reasons, not_found_order_ids }
*/
async convertOrdersToB2b(params = {}) {
const { ctx, app } = this;
const normalizedWarehouseId = Number(params && params.warehouseId || 0);
if (!Number.isInteger(normalizedWarehouseId) || normalizedWarehouseId <= 0) {
throw new Error('未识别到当前仓库上下文');
}
const rawIds = params && params.orderIds;
const normalizedOrderIds = [ ...new Set(
(Array.isArray(rawIds) ? rawIds : [ rawIds ])
.map(item => Number(item))
.filter(item => Number.isInteger(item) && item > 0)
) ];
if (normalizedOrderIds.length === 0) {
throw new Error('订单ID不能为空');
}
if (normalizedOrderIds.length > ORDER_B2B_CONVERT_BATCH_LIMIT) {
throw new Error(`单次最多转换 ${ORDER_B2B_CONVERT_BATCH_LIMIT} 个订单`);
}
const operator = params && params.operator && typeof params.operator === 'object'
? params.operator
: null;
const { Op } = app.Sequelize;
const orderModel = await ctx.model.OrderDeliveryFactory.getCurrentModel(normalizedWarehouseId);
const transaction = await ctx.model.transaction();
const convertedRows = [];
const skippedReasons = [];
let notFoundOrderIds = [];
try {
const lockRows = await orderModel.findAll({
attributes: [
'id', 'delivery_order_code', 'store_id', 'step',
'print_status', 'lock_status', 'intercept_status', 'is_b2b',
],
where: {
id: { [Op.in]: normalizedOrderIds },
warehouse_id: normalizedWarehouseId,
},
raw: true,
transaction,
lock: transaction.LOCK.UPDATE,
});
const rowMap = new Map((Array.isArray(lockRows) ? lockRows : []).map(row => [ Number(row && row.id || 0), row ]));
notFoundOrderIds = normalizedOrderIds.filter(orderId => !rowMap.has(orderId));
for (const orderId of normalizedOrderIds) {
const row = rowMap.get(orderId);
if (!row) {
continue;
}
const skipReason = this.resolveConvertSkipReason(row);
if (skipReason) {
skippedReasons.push({
order_id: orderId,
delivery_order_code: String(row.delivery_order_code || '').trim(),
reason: skipReason,
});
continue;
}
convertedRows.push(row);
}
if (convertedRows.length > 0) {
const convertedOrderIds = convertedRows.map(row => Number(row.id));
const now = new Date();
await orderModel.update(
{ is_b2b: 'Y', updated_at: now },
{
where: {
id: { [Op.in]: convertedOrderIds },
warehouse_id: normalizedWarehouseId,
},
transaction,
}
);
// 写入 B2B 作业明细(uk_order_id 唯一,已存在时跳过不覆盖)
const b2bModel = ctx.model.OrderB2b;
for (const row of convertedRows) {
await b2bModel.findOrCreate({
where: { order_id: Number(row.id) },
defaults: {
order_id: Number(row.id),
warehouse_id: normalizedWarehouseId,
store_id: Number(row.store_id || 0) > 0 ? Number(row.store_id) : null,
delivery_order_code: String(row.delivery_order_code || '').trim(),
created_at: now,
updated_at: now,
},
transaction,
});
}
}
await transaction.commit();
} catch (error) {
await transaction.rollback();
throw error;
}
// 操作日志在事务提交后写入,失败不影响主流程
for (const row of convertedRows) {
try {
await ctx.service.systems.operationLog.createOperationLog({
businessType: 'order',
businessId: Number(row.id),
operationCode: ORDER_B2B_CONVERT_OPERATION_CODE,
operationAction: 'UPDATE',
changeSummary: '订单转为B2B订单',
operator,
extras: {
warehouseId: normalizedWarehouseId,
orderId: Number(row.id),
orderNo: String(row.delivery_order_code || '').trim(),
},
beforeChanges: null,
});
} catch (error) {
ctx.logger.warn(`[orderB2b.convertOrdersToB2b] 写入操作日志失败,不影响业务, orderId=${row.id}, error=${error.message}`);
}
}
const skippedOrderIds = [ ...new Set(skippedReasons.map(item => item.order_id)) ];
return {
converted_order_ids: [ ...new Set(convertedRows.map(row => Number(row.id))) ],
converted_count: convertedRows.length,
skipped_order_ids: skippedOrderIds,
skipped_count: skippedOrderIds.length,
skipped_reasons: skippedReasons,
not_found_order_ids: notFoundOrderIds,
};
}
/**
* 判断订单是否满足转 B2B 条件,返回跳过原因;可转换时返回空串。
*
* 条件:待处理(step != 0)、未打印(print_status != fin)、
* 未锁定(lock_status = none)、未拦截(intercept_status = none)、未转 B2B(is_b2b != Y)。
*
* @param {Object} row 订单行。
* @return {string} 跳过原因,可转换返回空字符串。
*/
resolveConvertSkipReason(row = {}) {
if (Number(row && row.step || 0) === 0) {
return '订单待审核,不允许转B2B';
}
if (String(row && row.print_status || '').trim() === 'fin') {
return '订单已打印,不允许转B2B';
}
if (String(row && row.lock_status || 'none').trim() !== 'none') {
return '订单已锁定,不允许转B2B';
}
if (String(row && row.intercept_status || 'none').trim() !== 'none') {
return '订单已拦截,不允许转B2B';
}
if (String(row && row.is_b2b || '').trim() === 'Y') {
return '订单已是B2B订单';
}
return '';
}
}
module.exports = OrderB2bService;

View File

@ -0,0 +1,31 @@
'use strict';
/**
* B2B 订单作业明细表 wms_order_b2b 增加 is_print 列(是否打印,默认 N)。
*
* 字段:is_print ENUM('Y','N') NOT NULL DEFAULT 'N'(N=未打印 Y=已打印)。
* 索引:idx_is_print(按打印状态筛选)。
*/
const TABLE_NAME = 'wms_order_b2b';
const COLUMN_NAME = 'is_print';
module.exports = {
// eslint-disable-next-line no-unused-vars
async up(queryInterface, Sequelize) {
const { ENUM } = Sequelize;
await queryInterface.addColumn(TABLE_NAME, COLUMN_NAME, {
type: ENUM('Y', 'N'),
allowNull: false,
defaultValue: 'N',
comment: '是否打印:Y=已打印 N=未打印',
});
await queryInterface.addIndex(TABLE_NAME, [ COLUMN_NAME ], { name: 'idx_is_print' });
},
// eslint-disable-next-line no-unused-vars
async down(queryInterface, Sequelize) {
await queryInterface.removeIndex(TABLE_NAME, 'idx_is_print');
await queryInterface.removeColumn(TABLE_NAME, COLUMN_NAME);
},
};