gyq

tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js

@@ -14,51 +14,59 @@ class DeliverybillService extends ServiceBase {
     }
 
     async updateOrderStatus(pobj) {
-        let deliverData = await this.dao.findOne({
-            id: pobj.deliverId
-        });
-        if (!deliverData) {
-            throw new Error("查不到此交付单");
-        }
-        if (deliverData.delivery_status !== system.SERVERSESTATUS.RECEIVED) {
-            throw new Error("该状态下不可处理");
-        }
-        if (!deliverData.delivery_info.companyName) {
-            throw new Error("查不到对应公司名称");
-        }
-        let updateResult = {};
-        let { delivery_info } = deliverData;
-        if (pobj.orderStaus === true) {
-            updateResult = {
-                delivery_info: {
-                    ...delivery_info,
-                    setupAt: pobj.setupAt//建账时间
-                },
-                delivery_status: system.SERVERSESTATUS.WAITUSERCONFIRM
+        try{
+            let deliverData = await this.dao.findOne({
+                id: pobj.deliverId
+            });
+            if (!deliverData) {
+                throw new Error("查不到此交付单");
             }
-        }
-        if (pobj.orderStaus === false) {
-            updateResult = {
-                delivery_status: system.SERVERSESTATUS.CLOSED,
-                close_reason: pobj.note
+            if (deliverData.delivery_status !== system.SERVERSESTATUS.RECEIVED) {
+                throw new Error("该状态下不可处理");
+            }
+            if (!deliverData.delivery_info.companyName) {
+                throw new Error("查不到对应公司名称");
+            }
+            let updateResult = {};
+            let { delivery_info } = deliverData;
+            if (pobj.orderStaus === true) {
+                updateResult = {
+                    delivery_info: {
+                        ...delivery_info,
+                        setupAt: pobj.setupAt//建账时间
+                    },
+                    delivery_status: system.SERVERSESTATUS.WAITUSERCONFIRM
+                }
+            }
+            if (pobj.orderStaus === false) {
+                updateResult = {
+                    delivery_status: system.SERVERSESTATUS.CLOSED,
+                    close_reason: pobj.note
+                }
             }
+            // 通过消息队列 发送 融易算 
+            await toFtClient.feedbackToRys({
+                ...pobj,
+                bizId: deliverData.delivery_info.bizId
+            });
+            await this.dao.updateByWhere(updateResult, {
+                id: pobj.deliverId
+            });
+            this.logService.insertInfo({
+                flowType: system.FLOWCODE.DELIVERY,
+                flowId: pobj.deliverId,
+                statusCode: updateResult.delivery_status,
+                clerkName: pobj.userid,
+                clerkId: pobj.username
+            });
+            console.log("deliverySve:updateOrderStatus:success-----------------------------------------success");
+            return "SUCCESS"
         }
-        // 通过消息队列 发送 融易算 
-        await toFtClient.feedbackToRys({
-            ...pobj,
-            bizId: deliverData.delivery_info.bizId
-        });
-        await this.dao.updateByWhere(updateResult, {
-            id: pobj.deliverId
-        });
-        this.logService.insertInfo({
-            flowType: system.FLOWCODE.DELIVERY,
-            flowId: pobj.deliverId,
-            statusCode: updateResult.delivery_status,
-            clerkName: pobj.userid,
-            clerkId: pobj.username
-        });
-        return "SUCCESS"
+        catch(error){
+            console.log("deliverySve:updateOrderStatus:error------------------------------------------" + error);
+            return error;
+        }
+       
     }
 
     async setupBill(pobj) {