问题:店管家 /NewOrder/List 只支持按时间窗查询,不提供发货状态过滤, 原实现仅按 UpFxUserId 归属就整批入库,导致 sended/success/close 的订单 全部堆进「待审核」(实测店铺 19 近 7 天平台返回 385 单,真正待发货只有 11 单)。 - dgj 新增 isOrderFinished():ErpState∈sended/success/close(及各平台等价状态)、 有 OnlineSendTime、面单 IsSended=true、LogisticStatus>0 任一命中即视为已处理; PrintState/ExpressPrintTime 仅表示已打印面单,不作为判定依据 - listOrders 过滤未发货订单,返回 skipped 与 finished 列表 - externalPrintOrder.syncOrders 新增 voidFinishedOrders():本地仍处于待审核、 平台侧已发货的副本自动作废(写 void_at/void_reason + 操作日志),已审核订单不动 - orderStatus.voidOrder 支持 principalId(定时任务无登录态) - 手动/自动拉单消息、接口返回、接口契约、前端提示补充「跳过已发货 / 自动作废」统计 - 新增 scripts/cleanup-shipped-pending-orders.js(npm run orders:cleanup-shipped): 按同一口径清理历史脏单,默认 dry-run,--apply 才删除 - 新增 isOrderFinished 单测(7 项) 已清理历史脏单 103 条(备份见会话 files/backup-shipped-pending-orders.json), 清理后待审核仅剩 2 单真实的平台待发货订单。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
46 lines
1.7 KiB
JavaScript
46 lines
1.7 KiB
JavaScript
'use strict';
|
||
|
||
const { assert } = require('egg-mock/bootstrap');
|
||
const DgjService = require('../../../app/lib/printPlatform/dgj');
|
||
|
||
describe('printPlatform/dgj isOrderFinished', () => {
|
||
const base = { ErpState: 'waitsellersend', PrintState: 0, LogisticStatus: 0, WaybillCodes: [] };
|
||
|
||
it('ErpState 为 sended / success / close 时判定为已处理', () => {
|
||
for (const state of [ 'sended', 'success', 'close', 'SENDED', 'Closed' ]) {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, ErpState: state }), true, state);
|
||
}
|
||
});
|
||
|
||
it('待发货且没有任何发货证据时保留(需要处理)', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished(base), false);
|
||
});
|
||
|
||
it('有 OnlineSendTime 时判定为已发货', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, OnlineSendTime: '2026-11-02 10:00:00' }), true);
|
||
});
|
||
|
||
it('面单包裹 IsSended=true 时判定为已发货', () => {
|
||
assert.strictEqual(
|
||
DgjService.isOrderFinished({ ...base, WaybillCodes: [{ WaybillCode: '770', IsSended: false }, { WaybillCode: '771', IsSended: true }] }),
|
||
true
|
||
);
|
||
});
|
||
|
||
it('LogisticStatus > 0 时判定为已发货', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({ ...base, LogisticStatus: 2 }), true);
|
||
});
|
||
|
||
it('只打印了面单、未发货(PrintState=1 且有 ExpressPrintTime)时仍需要处理', () => {
|
||
assert.strictEqual(
|
||
DgjService.isOrderFinished({ ...base, PrintState: 1, ExpressPrintTime: '2026-11-02 10:00:00' }),
|
||
false
|
||
);
|
||
});
|
||
|
||
it('状态字段缺失时不误判', () => {
|
||
assert.strictEqual(DgjService.isOrderFinished({}), false);
|
||
assert.strictEqual(DgjService.isOrderFinished(null), false);
|
||
});
|
||
});
|