fix: 年报流程联调

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

@@ -198,8 +198,10 @@ class DeliverService extends ServiceBase {
                 // 推送年报信息
                 // 推送年报信息
                 await pushTx.pushChangeOrder(pushTx.TXSTATUS.WAITDECLARE, annualReportData.delivery_code, {
                 await pushTx.pushChangeOrder(pushTx.TXSTATUS.WAITDECLARE, annualReportData.delivery_code, {
                     annualReport: annualReportArry.map(item => {
                     annualReport: annualReportArry.map(item => {
-                        item.status = item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
-                        return item
+                        return {
+                            ...item,
+                            status: item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
+                        }
                     })
                     })
                 })
                 })
 
 

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

@@ -19,7 +19,7 @@ const TXSTATUS = {
 }
 }
 const porApi = axios.create({
 const porApi = axios.create({
     baseURL: settings.txurl(), // api 的 base_url
     baseURL: settings.txurl(), // api 的 base_url
-    timeout: 5000, // request timeout
+    timeout: 2000, // request timeout
     headers: {
     headers: {
         'Content-Type': 'application/json'
         'Content-Type': 'application/json'
     }
     }
@@ -140,16 +140,23 @@ const pushDeclareReport = async (annualReport, deliverData) => {
  * @param {*} data 
  * @param {*} data 
  */
  */
 const postRequest = async (url, data) => {
 const postRequest = async (url, data) => {
-    console.log("请求数据 ------- ");
-    console.log(data);
-    let result = await porApi.post(url, data);
-    result = result.data;
-    console.log("返回数据 ------- ");
-    console.log(result);
-    if (result.status === 1) {
-        return result
-    } else {
-        throw new Error(result.message)
+    try {
+        console.log("请求数据 ------- ");
+        console.log(data);
+        console.log(JSON.stringify(data.actionBody.deliverContent));
+        let result = await porApi.post(url, data);
+        result = result.data;
+        console.log("返回数据 ------- ");
+        console.log(result);
+        if (result.status === 1) {
+            return result
+        } else {
+            throw new Error(result.message)
+        }
+    } catch (err) {
+        console.log("------ err -----");
+        console.log(err)
+        throw (err)
     }
     }
 }
 }