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

tx-fi-tax/app/base/db/models/delivery/delivery_bill.js

@@ -42,6 +42,10 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       type: DataTypes.STRING
     },
+    v_ftClientId: { // 财税 客户ID
+      allowNull: true,
+      type: DataTypes.STRING
+    },
     demand_code: {// 商机编号
       allowNull: true,
       type: DataTypes.STRING

tx-fi-tax/app/base/utils/toFtClient.js

@@ -107,14 +107,12 @@ const addCusAccApplyInfo = async (deliverData, pobj) => {
         customerName: deliverData.delivery_info.companyName,
         phoneNumber: deliverData.delivery_info.contactsPhone,
         valueAddedTax: valueAddedTax[pobj.taxpayerType],
-        serviceTime: moment(deliverData.delivery_info.serviceEndTime).diff(moment(deliverData.delivery_info.serviceStartTime), 'months').toString(),
+        serviceTime: Math.round(moment(deliverData.delivery_info.serviceEndTime).diff(moment(deliverData.delivery_info.serviceStartTime), 'months', true)).toString(),
         initPeriod: parseInt(moment(deliverData.delivery_info.serviceStartTime).format('YYYYMMDD')),
         companyId: pobj.supplier
     }
     await postToFtBySign('/cusAccApplyInfo/addCusAccApplyInfo', reqData);
 }
-
-// console.log(moment("2021-05-31").diff(moment("2020-06-01"), 'months', true).toString())
 module.exports = {
     postToFtBySign,
     addCusAccApplyInfo,