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

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

@@ -76,7 +76,7 @@ const getChannelCompany = async (id) => {
         ...reqData,
         ...reqData,
         sign
         sign
     });
     });
-    companyData = companyData.data.datas;
+    companyData = companyData.datas;
     if (id) {
     if (id) {
         companyData = _.find(companyData, (item) => {
         companyData = _.find(companyData, (item) => {
             return item.id === id
             return item.id === id

tx-fi-tax/app/config/routes/api.js

@@ -59,7 +59,7 @@ module.exports = function (app) {
 		console.log("-------------- 财税  acceptFtCallback ------------");
 		console.log("-------------- 财税  acceptFtCallback ------------");
 		try {
 		try {
 			console.log(JSON.stringify(req.body));
 			console.log(JSON.stringify(req.body));
-			await deliverService.fromFtToRys(JSON.parse(req.body.info));
+			await deliverService.fromFtToRys(req.body);
 			res.json({
 			res.json({
 				code: 1,
 				code: 1,
 				msg: "SUCCESS",
 				msg: "SUCCESS",