gyq

001ea909 · 王勇飞 · 29d95b62 · 001ea909
Commit 001ea909 authored Jul 10, 2020 by 王勇飞
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

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

No files found.
--- a/center-manage/app/base/service/impl/common/channelhandlers/tx.js
+++ b/center-manage/app/base/service/impl/common/channelhandlers/tx.js
@@ -308,6 +308,14 @@ class TxHandler {
          if (datajson.actionBody.orderSnapshot.hasOwnProperty("annualReport")) {//年报信息
            params.baseInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
          }
+          else{
+            if (datajson.actionBody.orderSnapshot.annual_report && datajson.actionBody.orderSnapshot.annual_report != 'undefined') {
+              params.baseInfo.annualReport = true;//shifouxuyaonianbao
+            }
+            else {
+              params.baseInfo.annualReport = false;
+            }
+          }
          if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) {//注册地址类型
            if (datajson.actionBody.orderSnapshot.addressType === true || datajson.actionBody.orderSnapshot.addressType === "practical") {
              params.baseInfo.addressType = "practical";
@@ -373,12 +381,6 @@ 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);