Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

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

@@ -27,7 +27,7 @@ class DeliverybillService extends ServiceBase {
         if (pobj.orderStaus === true) {
             updateResult = {
                 delivery_info: {
-                    delivery_info,
+                    ...delivery_info,
                     setupAt: pobj.setupAt//建账时间
                 },
                 delivery_status: system.SERVERSESTATUS.WAITUSERCONFIRM
@@ -93,18 +93,18 @@ class DeliverybillService extends ServiceBase {
             deliveryNumber: deliverData.delivery_code,      // 交付单编号        
             companyName: deliverData.delivery_info.companyName,// 企业名称
             uscc: deliverData.delivery_info.creditCode,   //统一信用代码
-            taxpayerType: delivery_info.taxpayerType, //纳税人类型 1 一般；2 小规模
+            taxpayerType: deliverData.delivery_info.taxpayerType, //纳税人类型 1 一般；2 小规模
             //会计准侧
-            companyBizType: delivery_info.companyBizType,// 公司类型  1-商贸型；2-服务型；3-特殊行业；4-其他
-            areaType: delivery_info.areaType, //区域类型 city-城市       
-            area: service_address,              // 服务 地区 编码
-            contactsName: delivery_info.contactsName,// 联系人
-            contactsPhone: delivery_info.contactsPhone,// 联系电话
-            owner: salesman_name,//所属人
-            deliveryStatus: delivery_status,    // 交付单状态 
-            setupStatus: delivery_info.setupStatus || System.SERVERSESTATUS.NOTSETUP,//建账状态 notsetup | setup
-            createdAt: created_at,
-            updatedAt: updated_at,
+            companyBizType: deliverData.delivery_info.companyBizType,// 公司类型  1-商贸型；2-服务型；3-特殊行业；4-其他
+            areaType: deliverData.delivery_info.areaType, //区域类型 city-城市       
+            area: deliverData.service_address,              // 服务 地区 编码
+            contactsName: deliverData.delivery_info.contactsName,// 联系人
+            contactsPhone: deliverData.delivery_info.contactsPhone,// 联系电话
+            owner: deliverData.salesman_name,//所属人
+            deliveryStatus: deliverData.delivery_status,    // 交付单状态 
+            setupStatus: deliverData.delivery_info.setupStatus || System.SERVERSESTATUS.NOTSETUP,//建账状态 notsetup | setup
+            createdAt: deliverData.created_at,
+            updatedAt: deliverData.updated_at,
         }
         if (deliverData.scheme_number) {
             let schemeData = await this.fitaxschemeDao.findOne({