Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -212,7 +212,7 @@ class TxHandler {
             params.channelNumber = datajson.actionBody.orderSnapshot.channelNumber;//渠道编码
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("isWhether")) {
-            if (datajson.actionBody.orderSnapshot.isWhether) {
+            if (datajson.actionBody.orderSnapshot.isWhether === true || datajson.actionBody.orderSnapshot.isWhether === "yes") {
               params.baseInfo.isWhether = "yes";//是否刻章
             }
             else {
@@ -220,7 +220,7 @@ class TxHandler {
             }
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("financial")) {
-            if (datajson.actionBody.orderSnapshot.financial) {
+            if (datajson.actionBody.orderSnapshot.financial === true || datajson.actionBody.orderSnapshot.financial  === "yes") {
               params.baseInfo.financial = "yes";
             }
             else {
@@ -255,7 +255,7 @@ class TxHandler {
             params.baseInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) {//注册地址类型
-            if (datajson.actionBody.orderSnapshot.addressType) {
+            if (datajson.actionBody.orderSnapshot.addressType === true || datajson.actionBody.orderSnapshot.addressType === "practical") {
               params.baseInfo.addressType = "practical";
             }
             else {
@@ -269,15 +269,29 @@ class TxHandler {
             params.baseInfo.companyName = datajson.actionBody.orderSnapshot.companyName;//公司名称
             params.companyInfo.companyName = datajson.actionBody.orderSnapshot.companyName;
           }
+          else if (datajson.actionBody.orderSnapshot.company && datajson.actionBody.orderSnapshot.company != 'undefined') {
+            params.baseInfo.companyName = datajson.actionBody.orderSnapshot.company;//公司名称
+            params.companyInfo.companyName = datajson.actionBody.orderSnapshot.company;
+          }
           if (datajson.actionBody.orderSnapshot.companyProperties && datajson.actionBody.orderSnapshot.companyProperties != 'undefined') {
             params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyProperties;//公司性质名称
           }
-          if (datajson.actionBody.orderSnapshot.companyType && datajson.actionBody.orderSnapshot.companyType != 'undefined') {
+          else if (datajson.actionBody.orderSnapshot.companyType && datajson.actionBody.orderSnapshot.companyType != 'undefined') {
             params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyType;//公司性质名称
           }
+          else if (datajson.actionBody.orderSnapshot.registeredName && datajson.actionBody.orderSnapshot.registeredName != 'undefined') {
+            params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.registeredName;//公司性质名称
+          }
           if (datajson.actionBody.orderSnapshot.fullAddress && datajson.actionBody.orderSnapshot.fullAddress != 'undefined') {
             params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.fullAddress;//详细地址
           }
+          else if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
+            params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.residenceAddress;//详细地址
+          }
+          if (datajson.actionBody.orderSnapshot.virtualPrice && datajson.actionBody.orderSnapshot.virtualPrice != 'undefined') {
+            params.companyInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice;//虚拟地址价格
+            params.baseInfo.virtualPrice = datajson.actionBody.orderSnapshot.virtualPrice;//虚拟地址价格
+          }
           if (datajson.actionBody.orderSnapshot.residenceAddress && datajson.actionBody.orderSnapshot.residenceAddress != 'undefined') {
             params.companyInfo.residenceAddress = datajson.actionBody.orderSnapshot.residenceAddress;//zhusuo
           }
@@ -305,6 +319,12 @@ class TxHandler {
           if (datajson.actionBody.orderSnapshot.shareholderName && datajson.actionBody.orderSnapshot.shareholderName != 'undefined') {
             params.companyInfo.shareholderName = datajson.actionBody.orderSnapshot.shareholderName;//法人代表
           }
+          if (datajson.actionBody.orderSnapshot.annual_report && datajson.actionBody.orderSnapshot.annual_report != 'undefined') {
+            params.baseInfo.annualReport = true;//shifouxuyaonianbao
+          }
+          else{
+            params.baseInfo.annualReport = false;
+          }
 
           var rtn = await rc.execPost3({ "d": params }, requrl);
           var j = JSON.parse(rtn.stdout);
@@ -315,7 +335,7 @@ class TxHandler {
             "statusReason": ""
           }
           rtn = await rc.execPost3({ "d": stau }, bizurl);//更新商机状态为已完成
-          var j1 = SON.parse(rtn.stdout);
+          var j1 = JSON.parse(rtn.stdout);
           console.log("j1---------------------------------" + rtn.stdout);
           if (j.status == 0 && j1.status == 0) {
             await this.cacheManager["TxCache"].cache(cachestr, null, 1200000);