优化 交付流程

icp-deliver/app/base/service/impl/delivery/deliverSve.js

@@ -108,7 +108,7 @@ class DeliverService extends ServiceBase {
     /**
     /**
          * 判断 交付单状态下能否更新
          * 判断 交付单状态下能否更新
          */
          */
-    const deliverData = await this.dao.findOne({
+    const deliverData = await this.dao.findInfo({
       id: pobj.id,
       id: pobj.id,
     });
     });
     if (!deliverData) {
     if (!deliverData) {
@@ -126,16 +126,16 @@ class DeliverService extends ServiceBase {
         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),
-            }
+        const { material, qualification } = deliverData;
+        const { proposerInfo: { recipientInfo } } = material;
+        if (!qualification) {
+          throw new Error("请上传资质信息")
+        }
+        materialInfo = {
+          qualification,
+          recipientInfo: {
+            ...recipientInfo,
+            phone: encryptStr(recipientInfo.phone),
           }
           }
         }
         }
         status = system.SERVERSESTATUS.POSTING;
         status = system.SERVERSESTATUS.POSTING;