Commit a6fc95e8 by Sxy

fix: 流程优化

parent 1472f418
...@@ -119,12 +119,25 @@ class DeliverService extends ServiceBase { ...@@ -119,12 +119,25 @@ class DeliverService extends ServiceBase {
} }
let status; let status;
let txstatus; let txstatus;
let materialInfo;
switch (deliverData.delivery_status) { switch (deliverData.delivery_status) {
case system.SERVERSESTATUS.SUBMITING: case system.SERVERSESTATUS.SUBMITING:
status = system.SERVERSESTATUS.DISPOSEING; status = system.SERVERSESTATUS.DISPOSEING;
txstatus = pushTx.TXSTATUS.DISPOSEING; txstatus = pushTx.TXSTATUS.DISPOSEING;
break; break;
case system.SERVERSESTATUS.DISPOSEING: case system.SERVERSESTATUS.DISPOSEING:
const material = await this.materialDao.findOne({
deliver_id: pobj.id,
});
if (material) {
const { proposerInfo: { recipientInfo } } = material;
materialInfo = {
recipientInfo: {
...recipientInfo,
phone: encryptStr(recipientInfo.phone),
}
}
}
status = system.SERVERSESTATUS.POSTING; status = system.SERVERSESTATUS.POSTING;
txstatus = pushTx.TXSTATUS.POSTING; txstatus = pushTx.TXSTATUS.POSTING;
break; break;
...@@ -134,7 +147,7 @@ class DeliverService extends ServiceBase { ...@@ -134,7 +147,7 @@ class DeliverService extends ServiceBase {
break; break;
} }
await pushTx.pushChangeOrder(txstatus, deliverData.delivery_code); await pushTx.pushChangeOrder(txstatus, deliverData.delivery_code, materialInfo);
await this.dao.updateByWhere({ await this.dao.updateByWhere({
delivery_status: status, delivery_status: status,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment