fix: 去掉 service层的try catch

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

@@ -14,108 +14,93 @@ class DeliverybillService extends ServiceBase {
     }
     }
 
 
     async updateOrderStatus(pobj) {
     async updateOrderStatus(pobj) {
-        try{
-            console.log("deliverySve:updateOrderStatus:pobj----------------------------------------",JSON.stringify(pobj));
-            let deliverData = await this.dao.findOne({
-                id: pobj.deliverId
-            });
-            console.log("deliverySve:updateOrderStatus:deliverData----------------------------------------",JSON.stringify(deliverData));
-            if (!deliverData) {
-                throw new Error("查不到此交付单");
-            }
-            if (deliverData.delivery_status !== system.SERVERSESTATUS.RECEIVED) {
-                throw new Error("该状态下不可处理");
-            }
-            if (!deliverData.delivery_info.companyName) {
-                throw new Error("查不到对应公司名称");
-            }
+        console.log("deliverySve:updateOrderStatus:pobj----------------------------------------", JSON.stringify(pobj));
+        let deliverData = await this.dao.findOne({
+            id: pobj.deliverId
+        });
+        console.log("deliverySve:updateOrderStatus:deliverData----------------------------------------", JSON.stringify(deliverData));
+        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
-                }
-            }
-            if (pobj.orderStaus === false) {
-                updateResult = {
-                    delivery_status: system.SERVERSESTATUS.CLOSED,
-                    close_reason: pobj.note
-                }
+        let updateResult = {};
+        let { delivery_info } = deliverData;
+        if (pobj.orderStaus === true) {
+            updateResult = {
+                delivery_info: {
+                    ...delivery_info,
+                    setupAt: pobj.setupAt//建账时间
+                },
+                delivery_status: system.SERVERSESTATUS.WAITUSERCONFIRM
             }
             }
-            // 通过消息队列 发送 融易算 
-            await toFtClient.feedbackToRys({
-                ...pobj,
-                bizId: deliverData.delivery_info.bizId
-            });
-            console.log("deliverySve:updateOrderStatus:toFtClient---------------------------------------toFtClient");
-            await this.dao.updateByWhere(updateResult, {
-                id: pobj.deliverId
-            });
-            console.log("deliverySve:updateOrderStatus:updateByWhere---------------------------------------updateByWhere");
-            this.logService.insertInfo({
-                flowType: system.FLOWCODE.DELIVERY,
-                flowId: pobj.deliverId,
-                statusCode: updateResult.delivery_status,
-                clerkName: pobj.userid,
-                clerkId: pobj.username
-            });
-            console.log("deliverySve:updateOrderStatus:insertInfo---------------------------------------insertInfo");
-            console.log("deliverySve:updateOrderStatus:success-----------------------------------------success");
-            return "SUCCESS"
         }
         }
-        catch(error){
-            console.log("deliverySve:updateOrderStatus:error------------------------------------------" + error + "----SSSSSSSSSSSSSSSSSSSSSSSSS");
-            return error;
+        if (pobj.orderStaus === false) {
+            updateResult = {
+                delivery_status: system.SERVERSESTATUS.CLOSED,
+                close_reason: pobj.note
+            }
         }
         }
-       
+        // 通过消息队列 发送 融易算 
+        await toFtClient.feedbackToRys({
+            ...pobj,
+            bizId: deliverData.delivery_info.bizId
+        });
+        console.log("deliverySve:updateOrderStatus:toFtClient---------------------------------------toFtClient");
+        await this.dao.updateByWhere(updateResult, {
+            id: pobj.deliverId
+        });
+        console.log("deliverySve:updateOrderStatus:updateByWhere---------------------------------------updateByWhere");
+        this.logService.insertInfo({
+            flowType: system.FLOWCODE.DELIVERY,
+            flowId: pobj.deliverId,
+            statusCode: updateResult.delivery_status,
+            clerkName: pobj.userid,
+            clerkId: pobj.username
+        });
+        console.log("deliverySve:updateOrderStatus:insertInfo---------------------------------------insertInfo");
+        console.log("deliverySve:updateOrderStatus:success-----------------------------------------success");
+        return "SUCCESS"
     }
     }
 
 
     async setupBill(pobj) {
     async setupBill(pobj) {
-        try {
-            console.log("deliverySve:setupBill:pobj----------------------------------------",JSON.stringify(pobj));
-            let deliverData = await this.dao.findOne({
-                id: pobj.deliverId
-            });
-            if (!deliverData) {
-                throw new Error("查不到此交付单");
-            }
-            if (deliverData.delivery_status !== system.SERVERSESTATUS.INSERVICE) {
-                throw new Error("该状态下不可建账");
-            }
-            if (deliverData.delivery_info.setupStatus && deliverData.delivery_info.setupStatus === system.SERVERSESTATUS.SETUP) {
-                throw new Error("已建账");
-            }
-            // 通知 财税
-            await toFtClient.addCusAccApplyInfo(deliverData, pobj);
-            await this.dao.updateByWhere({
-                delivery_info: {
-                    ...delivery_info,
-                    setupStatus: system.SERVERSESTATUS.SETUP,
-                    setupInfo: {
-                        contactsName: pobj.contactsName,
-                        time: pobj.time,
-                        accountingType: pobj.accountingType,
-                        taxpayerType: pobj.taxpayerType,
-                        supplier: pobj.supplier
-                    }
-                }
-            }, {
-                id: pobj.deliverId
-            });
-            console.log("deliverySve:setupBill:SUCCESS----------------------------------------SUCCESS");
-            return "SUCCESS"
+        console.log("deliverySve:setupBill:pobj----------------------------------------", JSON.stringify(pobj));
+        let deliverData = await this.dao.findOne({
+            id: pobj.deliverId
+        });
+        if (!deliverData) {
+            throw new Error("查不到此交付单");
         }
         }
-        catch(error)
-        {
-            console.log("deliverySve:setupBill:error----------------------------------------"+error);
-            return error;
+        if (deliverData.delivery_status !== system.SERVERSESTATUS.INSERVICE) {
+            throw new Error("该状态下不可建账");
         }
         }
-        
+        if (deliverData.delivery_info.setupStatus && deliverData.delivery_info.setupStatus === system.SERVERSESTATUS.SETUP) {
+            throw new Error("已建账");
+        }
+        // 通知 财税
+        await toFtClient.addCusAccApplyInfo(deliverData, pobj);
+        await this.dao.updateByWhere({
+            delivery_info: {
+                ...delivery_info,
+                setupStatus: system.SERVERSESTATUS.SETUP,
+                setupInfo: {
+                    contactsName: pobj.contactsName,
+                    time: pobj.time,
+                    accountingType: pobj.accountingType,
+                    taxpayerType: pobj.taxpayerType,
+                    supplier: pobj.supplier
+                }
+            }
+        }, {
+            id: pobj.deliverId
+        });
+        console.log("deliverySve:setupBill:SUCCESS----------------------------------------SUCCESS");
+        return "SUCCESS"
     }
     }
 
 
     async deliverInfo(pobj) {
     async deliverInfo(pobj) {