diff --git a/src/modules/order-rules/delivery.cjs b/src/modules/order-rules/delivery.cjs index 96db6eb..c4be62e 100644 --- a/src/modules/order-rules/delivery.cjs +++ b/src/modules/order-rules/delivery.cjs @@ -14,6 +14,6 @@ function notifications(order){ const h=delivery(order,'huizhou'); return {normal:delivery(order),huizhou:h?{status:h.status,batchId:h.batchId||null,error:h.error||null,orderNos:[...(h.orderNos||[])],issues:[...(h.issues||[])]}:{status:'not_applicable',batchId:null,error:null,orderNos:[],issues:[]}}; } -function needsRuntimeCheck(order){return !!order?.archive&&(['pending','batched'].includes(order.status)||['pending','batched'].includes(delivery(order,'huizhou')?.status));} +function needsRuntimeCheck(order){return !!order?.archive&&(['pending','batched'].includes(order.status)||['pending','batched','blocked'].includes(delivery(order,'huizhou')?.status));} function reserved(order){return !!order?.batchId||!!delivery(order,'huizhou')?.batchId;} module.exports={modeOf,delivery,updateDelivery,notifications,needsRuntimeCheck,reserved}; diff --git a/tests/order-rules/huizhou-notification.test.cjs b/tests/order-rules/huizhou-notification.test.cjs index f8edce6..f8d8e33 100644 --- a/tests/order-rules/huizhou-notification.test.cjs +++ b/tests/order-rules/huizhou-notification.test.cjs @@ -8,7 +8,7 @@ const {orderDetail,batchDetail,summary}=require('../../src/modules/order-rules/q const {previewEffects}=require('../../src/modules/order-rules/effects-preview.cjs'); const cutoff='2026-10-19T03:00:00.000Z',admin={username:'admin',role:'admin'}; const mixed='订单号:O-100机芯号:CORE-O客户简称:普通客户总数量:10订单类别:参考订单订单类型:C业务模式:惠州数字毛利:绿标订单号:H-200机芯号:CORE-H客户简称:惠州创维数字技术有限公司总数量:20'; -function fixture(t,{enabled=true,title=mixed,template={}}={}){ +function fixture(t,{enabled=true,title=mixed,template={},attachPdf}={}){ const dir=fs.mkdtempSync(path.join(os.tmpdir(),'huizhou-delivery-')),clock=()=>new Date('2026-10-19T02:00:00Z'); const options={clock,capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true}};let store=new RuleStore(dir,options); const huiTemplate={id:'hui-template',version:1,status:'active',notificationMode:'huizhou',subject:'惠州 {{订单号}}',text:'业务访问 https://example.test/business\n{{订单明细}}',html:'

业务访问 https://example.test/business

{{订单明细}}
',...template}; @@ -16,7 +16,7 @@ function fixture(t,{enabled=true,title=mixed,template={}}={}){ t.after(()=>{store.close();fs.rmSync(dir,{recursive:true,force:true});}); const reference=require('../../src/modules/order-rules/catalog.cjs').adapters.find(a=>a.id==='bs-change'); const {sample}=activateReferenceMapping(store,'bs-change',{connectionId:'c1',instanceId:'i1',taskId:'t1',revision:'1',receivedAt:'2026-10-19T01:00:00Z',title,fields:{[reference.fields.orderNo]:extractTitle(title).orders[0].orderNo}}); - const rule=store.saveRule({...store.get('rules','bs-change').draft,to:['USER@example.test'],cc:['copy@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt',huizhouEnabled:enabled,huizhouTemplateId:enabled?'hui-template':''},'admin'); + const rule=store.saveRule({...store.get('rules','bs-change').draft,to:['USER@example.test'],cc:['copy@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt',huizhouEnabled:enabled,huizhouTemplateId:enabled?'hui-template':'',...(attachPdf===undefined?{}:{attachPdf})},'admin'); // Capture the final real-shaped sample through the normal mapping/trial contract. const capture=store.recordCapture({sample,taskId:'final',snapshot:{processVersion:sample.processVersion,fields:Object.entries(sample.fields).map(([path,value])=>({path,value}))}}); assert.equal(store.capturedPreview(capture.id).valid,true);store.publish(rule.id,{version:rule.version},'admin'); @@ -138,3 +138,22 @@ test('manual Hui resend cannot bypass a new source conflict on the shared archiv const result=await d.resend(hui.id,{version:f.store.get('batches',hui.id).version,idempotencyKey:'conflict-resend',note:'核验发送失败但来源仍存在冲突'},admin); assert.equal(result.status,'failed');assert.equal(f.sent.length,0);assert.equal(f.store.get('orders',f.order.id).status,'sent'); }); +for(const ordinaryStatus of ['sent','unknown'])for(const observed of [true,false])test(`blocked Hui without PDF attachments checks corrupt receipts and recovers after repair; normal=${ordinaryStatus}, todo observed=${observed}`,async t=>{ + const f=fixture(t,{attachPdf:false}),d=f.dispatcher();t.after(()=>d.stop());f.store.templateResolver=()=>null; + const batches=f.store.prepare(cutoff,'admin');assert.equal(batches.length,1);const normal=batches[0];assert.deepEqual(normal.attachments,[]);f.failSend(ordinaryStatus==='unknown');await d.dispatch(normal,f.store.settings());f.failSend(false);assert.equal(f.store.get('batches',normal.id).status,ordinaryStatus);assert.equal(f.store.get('orders',f.order.id).notifications.huizhou.status,'blocked'); + const {OrderExecutionCoordinator}=require('../../src/modules/order-execution/coordinator.cjs'); + const connection={id:'c1',owner:'admin',status:'connected'},row={...f.sample};delete row.fields;delete row.brief; + const taskId=crypto.createHash('sha256').update(JSON.stringify(['c1','todo',String(row.instanceId),String(row.taskId),String(row.revision)])).digest('hex'); + f.store.put('execution-tasks',{id:taskId,version:1,connectionId:'c1',owner:'admin',orderId:f.order.id,row,categoryIds:['bs-change'],status:ordinaryStatus,step:'complete',runtimeCheck:{status:'ready'}}); + let corrupt=true,reads=0; + const provider={scan:async()=>observed?[row]:[],capabilities:()=>({liveTodo:true,pdfExport:true}),capture:async()=>{throw Error('must not recapture blocked Hui receipt');}}; + const archive={capabilities:()=>({automaticArchive:true,pdfExport:true}),probe:async()=>({automaticArchive:true,pdfExport:true}),read:async()=>{reads++;return corrupt?Buffer.from('corrupt receipt'):f.bytes;},archive:async()=>{throw Error('must not reexport blocked Hui receipt');}}; + const execution=new OrderExecutionCoordinator({store:f.store,workspace:{getConnection:()=>connection,snapshot:()=>({connections:[connection]})},provider,archive,clock:()=>new Date(cutoff)});t.after(()=>execution.stop()); + const principal={user:admin,sessionId:'fixture-session'}; + await execution.scan({connectionId:'c1',idempotencyKey:'blocked-corrupt'},principal); + f.store.templateResolver=(category,rule,mode)=>mode==='huizhou'?f.huiTemplate:null; + assert.deepEqual(f.store.prepare(cutoff,'admin'),[]);assert.equal(reads,1);assert.equal(f.store.get('execution-tasks',taskId).runtimeCheck.status,'blocked');assert.equal(f.sent.length,1); + corrupt=false;await execution.scan({connectionId:'c1',idempotencyKey:'blocked-repaired'},principal);assert.equal(reads,2);assert.equal(f.store.get('execution-tasks',taskId).runtimeCheck.status,'ready'); + const repaired=f.store.prepare(cutoff,'admin');assert.equal(repaired.length,1);const hui=repaired[0];assert.equal(hui.notificationMode,'huizhou');assert.deepEqual(hui.attachments,[]);await d.dispatch(hui,f.store.settings()); + assert.equal(f.store.get('batches',hui.id).status,'sent');assert.equal(f.store.get('batches',normal.id).status,ordinaryStatus);assert.deepEqual(f.sent.map(message=>message.subject),[normal.subject,hui.subject]);assert.equal(f.store.all('orders').length,1); +});