feat(consignment): 支持多数量拆分与份额级赠送,并对齐待抢单看板
- 匹配引擎支持一条库存按剩余数量拆给多张整单/拼单,份额数量、报酬、分配数量按实际占用计算 - 「我的寄卖」改为按占用单/份额一行 + 剩余库存行,卖家按 allocation/share/workOrder 定位确认加好友与提交凭证 - 解绑/撤销/超时按 allocation 精确回补,修复单绑定字段在多占用下被误清的问题 - 拼单好友赠送改为份额级 friend_added_at / gift_available_at(迁移 146),新增后台按份额确认加好友入口与寄卖赠送列 - 待抢单匹配看板改用新引擎:覆盖全部寄卖分类、拼单余量、精确/非精确/冲突明细,去掉手枪品类写死 - 发布押金改为该提报单全部售出/作废后才释放,避免多件库存分多单时提前退款 - 补齐集成测试与单测:拆分、多占用、份额级独立冷却与凭证、看板新旧引擎对齐
This commit is contained in:
@@ -205,3 +205,61 @@ test('标准验收的寄卖单:履约中 / 待验收,按钮文案是提交
|
||||
})
|
||||
assert.equal(pending.stage, CONSIGNMENT_ITEM_STAGE.PENDING_ACCEPTANCE)
|
||||
})
|
||||
|
||||
test('拼单寄卖份额:加好友/冷却/提交按份额独立推导', () => {
|
||||
const waiting = deriveConsignmentItemStage({
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: friendGiftOrder(),
|
||||
share: { status: 'joined', friend_added_at: null, gift_available_at: null },
|
||||
viewer: SELLER,
|
||||
now: NOW,
|
||||
})
|
||||
assert.equal(waiting.stage, CONSIGNMENT_ITEM_STAGE.MATCHED_WAITING_FRIEND)
|
||||
assert.equal(waiting.canConfirmFriend, true)
|
||||
assert.equal(waiting.canSubmitEvidence, false)
|
||||
|
||||
const cooldown = deriveConsignmentItemStage({
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: friendGiftOrder(),
|
||||
share: {
|
||||
status: 'joined',
|
||||
friend_added_at: '2026-09-17T10:00:00.000Z',
|
||||
gift_available_at: '2026-09-17T13:00:00.000Z',
|
||||
},
|
||||
viewer: SELLER,
|
||||
now: NOW,
|
||||
})
|
||||
assert.equal(cooldown.stage, CONSIGNMENT_ITEM_STAGE.GIFT_COOLDOWN)
|
||||
assert.equal(cooldown.canSubmitEvidence, false)
|
||||
|
||||
const ready = deriveConsignmentItemStage({
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: friendGiftOrder(),
|
||||
share: {
|
||||
status: 'joined',
|
||||
friend_added_at: '2026-09-17T10:00:00.000Z',
|
||||
gift_available_at: '2026-09-17T11:00:00.000Z',
|
||||
},
|
||||
viewer: SELLER,
|
||||
now: NOW,
|
||||
})
|
||||
assert.equal(ready.stage, CONSIGNMENT_ITEM_STAGE.GIFT_READY)
|
||||
assert.equal(ready.canSubmitEvidence, true)
|
||||
|
||||
const submitted = deriveConsignmentItemStage({
|
||||
submissionStatus: 'approved',
|
||||
inventoryStatus: 'consumed',
|
||||
workOrder: friendGiftOrder(),
|
||||
share: {
|
||||
status: 'submitted',
|
||||
friend_added_at: '2026-09-17T10:00:00.000Z',
|
||||
gift_available_at: '2026-09-17T11:00:00.000Z',
|
||||
},
|
||||
viewer: SELLER,
|
||||
now: NOW,
|
||||
})
|
||||
assert.equal(submitted.stage, CONSIGNMENT_ITEM_STAGE.GIFT_SUBMITTED)
|
||||
})
|
||||
|
||||
@@ -92,10 +92,18 @@ export type ConsignmentItemWorkOrderInput = {
|
||||
assignedWorkerId?: number | null
|
||||
}
|
||||
|
||||
export type ConsignmentItemShareInput = {
|
||||
status: string
|
||||
friend_added_at?: string | null
|
||||
gift_available_at?: string | null
|
||||
}
|
||||
|
||||
export type DeriveConsignmentItemStageInput = {
|
||||
submissionStatus: string
|
||||
inventoryStatus?: string | null
|
||||
workOrder?: ConsignmentItemWorkOrderInput | null
|
||||
/** 拼单寄卖:这一行对应的卖家份额;有值时按份额推导,不再看整单赠送阶段 */
|
||||
share?: ConsignmentItemShareInput | null
|
||||
/** 当前查看者身份:卖家端要判断"是不是我在履约"才能给出按钮 */
|
||||
viewer?: { role: 'seller'; workerId: number } | { role: 'admin' }
|
||||
/** 便于测试注入"现在" */
|
||||
@@ -186,6 +194,46 @@ export function deriveConsignmentItemStage(
|
||||
const viewerWorkerId = input.viewer?.role === 'seller' ? Number(input.viewer.workerId) : 0
|
||||
const selfFulfilling =
|
||||
viewerWorkerId > 0 && Number(workOrder.assignedWorkerId || 0) === viewerWorkerId
|
||||
const nowMs = input.now ?? Date.now()
|
||||
|
||||
// 拼单寄卖:每个卖家一条份额,加好友/冷却/提交凭证互不影响。
|
||||
if (input.share) {
|
||||
const shareStatus = String(input.share.status || '').trim()
|
||||
if (shareStatus === 'accepted') {
|
||||
return build(CONSIGNMENT_ITEM_STAGE.COMPLETED, '该份额已验收结算')
|
||||
}
|
||||
if (shareStatus === 'cancelled') {
|
||||
return build(CONSIGNMENT_ITEM_STAGE.CANCELLED, '该份额已取消')
|
||||
}
|
||||
if (shareStatus === 'submitted') {
|
||||
return isFriendGift
|
||||
? build(CONSIGNMENT_ITEM_STAGE.GIFT_SUBMITTED, '赠送凭证已提交,等待客服审核')
|
||||
: build(CONSIGNMENT_ITEM_STAGE.PENDING_ACCEPTANCE, '验收材料已提交,等待客服验收')
|
||||
}
|
||||
if (isFriendGift) {
|
||||
const friendAddedAt = Date.parse(String(input.share.friend_added_at || ''))
|
||||
if (!Number.isFinite(friendAddedAt)) {
|
||||
return build(
|
||||
CONSIGNMENT_ITEM_STAGE.MATCHED_WAITING_FRIEND,
|
||||
'请先加上买家好友,加好后点「确认加好友」:确认即进入赠送冷却期,未完成赠送押金不退',
|
||||
{ canConfirmFriend: true },
|
||||
)
|
||||
}
|
||||
const availableAt = Date.parse(String(input.share.gift_available_at || ''))
|
||||
if (!Number.isFinite(availableAt) || availableAt > nowMs) {
|
||||
return build(CONSIGNMENT_ITEM_STAGE.GIFT_COOLDOWN, '本份额的赠送冷却未结束,请耐心等待')
|
||||
}
|
||||
return build(
|
||||
CONSIGNMENT_ITEM_STAGE.GIFT_READY,
|
||||
'本份额冷却已结束,请用账号赠送并上传赠送截图给客服审核(未完成赠送押金不退)',
|
||||
{ canSubmitEvidence: true, evidenceButtonLabel: '提交赠送截图' },
|
||||
)
|
||||
}
|
||||
return build(CONSIGNMENT_ITEM_STAGE.FULFILLING, '请提交本份额的验收材料,等待客服验收', {
|
||||
canSubmitEvidence: true,
|
||||
evidenceButtonLabel: '提交验收材料',
|
||||
})
|
||||
}
|
||||
|
||||
if (isFriendGift) {
|
||||
const now = input.now ?? Date.now()
|
||||
|
||||
Reference in New Issue
Block a user