fix: 材料 资质信息 邮寄信息 重复推

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

@@ -47,7 +47,9 @@ class DeliverService extends ServiceBase {
         if (!deliverData || ![
             system.SERVERSESTATUS.COLLECTING,
             system.SERVERSESTATUS.SUBMITING,
-            system.SERVERSESTATUS.DISPOSEING
+            system.SERVERSESTATUS.DISPOSEING,
+            system.SERVERSESTATUS.POSTING,
+            system.SERVERSESTATUS.SUCCESS,
         ].includes(deliverData.delivery_status)) {
             throw new Error("此交付单不可提交材料");
         }
@@ -185,9 +187,31 @@ class DeliverService extends ServiceBase {
         if (!deliverData) {
             throw new Error("查不到交付单");
         }
-        if (deliverData.delivery_status !== system.SERVERSESTATUS.DISPOSEING) {
+        if (![system.SERVERSESTATUS.DISPOSEING, system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(deliverData.delivery_status)) {
             throw new Error("该交付单状态下不可提交");
         }
+        if ([system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(deliverData.delivery_status)) {
+            //给腾讯 发消息
+            const STATUS = {
+                "success": pushTx.TXSTATUS.SUCCESS,
+                "posting": pushTx.TXSTATUS.POSTING
+            };
+
+            await pushTx.pushChangeOrder(STATUS[deliverData.delivery_status], deliverData.delivery_code, {
+                qualification: {
+                    businessScope: pobj.businessScope,
+                    businessTypes: pobj.businessTypes,
+                    certificateNumber: pobj.certificateNumber,
+                    endAt: pobj.endAt,
+                    file: pobj.file,
+                    serviceProject: pobj.serviceProject,
+                    startAt: pobj.startAt,
+                    deliver_id: pobj.deliver_id
+                }
+            });
+            await this.qualificationDao.createOrUpdate(pobj);
+            return "SUCCESS"
+        }
         let annualReportData;
         let annualReportArry = [];
 
@@ -326,15 +350,19 @@ class DeliverService extends ServiceBase {
         if (!result.qualification) {
             throw new Error("请先上传资质信息");
         }
-        if (result.delivery_status !== system.SERVERSESTATUS.DISPOSEING) {
+        if (![system.SERVERSESTATUS.DISPOSEING, system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.POSTING].includes(result.delivery_status)) {
             throw new Error("该状态下不可填写邮寄信息");
         }
         const { material } = result;
         let { proposerInfo } = material
         proposerInfo.recipientInfo = pobj.recipientInfo;
+        const STATUS = {
+            "disposeing": pushTx.TXSTATUS.POSTING,
+            "success": pushTx.TXSTATUS.SUCCESS,
+            "posting": pushTx.TXSTATUS.POSTING
+        };
 
-
-        await pushTx.pushChangeOrder(pushTx.TXSTATUS.POSTING, result.delivery_code, {
+        await pushTx.pushChangeOrder(STATUS[result.delivery_status], result.delivery_code, {
             qualification: result.qualification,
             recipientInfo: {
                 ...pobj.recipientInfo,
@@ -350,6 +378,7 @@ class DeliverService extends ServiceBase {
                 id: material.id
             }, t);
 
+            if (system.SERVERSESTATUS.DISPOSEING === result.delivery_status) {
                 await this.dao.updateByWhere({
                     delivery_status: system.SERVERSESTATUS.POSTING,
                 }, {
@@ -363,6 +392,7 @@ class DeliverService extends ServiceBase {
                     salesman_id: pobj.userid,
                     salesman_name: pobj.username
                 });
+            }
             return "success"
         });
     }

icp-deliver/app/base/utils/totxClient.js

@@ -9,7 +9,7 @@ const BUSINESSTYPE = {
     EDI: "/qcfw/edi/"
 }
 const TXSTATUS = {
-    COLLECTING: "70",//手机材料中
+    COLLECTING: "70",//收集材料中
     SUBMITING: "80",//递交材料中
     DISPOSEING: "90",//工信部处理中
     POSTING: "150",//证书已邮寄
@@ -110,15 +110,15 @@ const pushChangeOrder = async (status, orderNum, data = {}) => {
  */
 const submitMaterials = async (deliverData, materials) => {
     materials = buildValue(materials, encryptStr);
-    let status;
-    if (deliverData.delivery_status === system.SERVERSESTATUS.COLLECTING || deliverData.delivery_status === system.SERVERSESTATUS.SUBMITING) {
-        status = TXSTATUS.SUBMITING;
-    }
-    if (deliverData.delivery_status === system.SERVERSESTATUS.DISPOSEING) {
-        status = TXSTATUS.DISPOSEING;
+    const STATUS = {
+        "collecting": TXSTATUS.SUBMITING,
+        "submiting": TXSTATUS.SUBMITING,
+        "disposeing": TXSTATUS.DISPOSEING,
+        "posting": TXSTATUS.POSTING,
+        "success": TXSTATUS.SUCCESS
     }
     materials.proposerInfo.businessInformation.ifListed = materials.proposerInfo.businessInformation.ifListed === "true"
-    await pushChangeOrder(status, deliverData.delivery_code, {
+    await pushChangeOrder(STATUS[deliverData.delivery_status], deliverData.delivery_code, {
         servicerName: deliverData.facilitator_name,
         servicerCode: deliverData.facilitator_id,
         clerkId: deliverData.salesman_id,