gyq

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

@@ -48,12 +48,15 @@ class TxHandler {
         if (datajson.actionBody.CompanyName && datajson.actionBody.CompanyName != 'undefined') {
           params.companyName = datajson.actionBody.CompanyName;
         }
+        if (datajson.actionBody.UserName && datajson.actionBody.UserName != 'undefined'){
+          params.UserName = datajson.actionBody.UserName;
+        }
         if (salesmanInfo && salesmanInfo != 'undefined') {
           params.salesmanOpcode = salesmanInfo.opath;
           params.salesmanId = salesmanInfo.userId;
           params.clerkName = salesmanInfo.userName;
           params.clerkPhone = salesmanInfo.mobile,
-            params.servicerCode = salesmanInfo.compId
+          params.servicerCode = salesmanInfo.compId
         }
         var rtn = await rc.execPost3({ "d": params }, requrl);
         var j = JSON.parse(rtn.stdout);
@@ -166,7 +169,7 @@ class TxHandler {
             "businessName": ConsultTypeName,
             "skuCode": datajson.actionBody.txPriceCode,
             "txOrderNum":datajson.actionBody.txOrderNum,
-            "deliveryInfo": {
+            "baseInfo": {
               "txOrderNum": datajson.actionBody.txOrderNum,
               "isAdviser": "已分配",//是否分配顾问
               "contactsName": datajson.actionBody.orderSnapshot.contactsName,
@@ -201,55 +204,60 @@ class TxHandler {
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("isWhether")) {
             if (datajson.actionBody.orderSnapshot.isWhether) {
-              params.deliveryInfo.isWhether = "是";//是否刻章
+              params.baseInfo.isWhether = "yes";//是否刻章
             }
             else {
-              params.deliveryInfo.isWhether = "否";//是否刻章
+              params.baseInfo.isWhether = "no";//是否刻章
             }
           }
-          if (datajson.actionBody.orderSnapshot.financial && datajson.actionBody.orderSnapshot.financial != 'undefined') {
-            params.deliveryInfo.financial = datajson.actionBody.orderSnapshot.financial;//财税服务
+          if (datajson.actionBody.orderSnapshot.hasOwnProperty("financial")) {
+            if (datajson.actionBody.orderSnapshot.financial) {
+              params.baseInfo.financial = "yes";
+            }
+            else {
+              params.baseInfo.financial = "no";
+            }
           }
           if (datajson.actionBody.orderSnapshot.officialSeal && datajson.actionBody.orderSnapshot.officialSeal != 'undefined') {
-            params.deliveryInfo.officialSeal = datajson.actionBody.orderSnapshot.officialSeal;//公章扫描件
+            params.baseInfo.officialSeal = datajson.actionBody.orderSnapshot.officialSeal;//公章扫描件
           }
           if (datajson.actionBody.orderSnapshot.businessLicense && datajson.actionBody.orderSnapshot.businessLicense != 'undefined') {
-            params.deliveryInfo.businessLicense = datajson.actionBody.orderSnapshot.businessLicense;//营业执照扫描件
+            params.baseInfo.businessLicense = datajson.actionBody.orderSnapshot.businessLicense;//营业执照扫描件
           }
           if (datajson.actionBody.orderSnapshot.taxpayerType && datajson.actionBody.orderSnapshot.taxpayerType != 'undefined') {
-            params.deliveryInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerType;//纳税人类型名称
+            params.baseInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerType;//纳税人类型名称
           }
           if (datajson.actionBody.orderSnapshot.buyDuration && datajson.actionBody.orderSnapshot.buyDuration != 'undefined') {
-            params.deliveryInfo.buyDuration = datajson.actionBody.orderSnapshot.buyDuration;//购买时长
+            params.baseInfo.buyDuration = datajson.actionBody.orderSnapshot.buyDuration;//购买时长
           }
           if (datajson.actionBody.orderSnapshot.buyTime && datajson.actionBody.orderSnapshot.buyTime != 'undefined') {
-            params.deliveryInfo.buyTime = datajson.actionBody.orderSnapshot.buyTime;//购买时间
+            params.baseInfo.buyTime = datajson.actionBody.orderSnapshot.buyTime;//购买时间
           }
           if (datajson.actionBody.orderSnapshot.isRenew && datajson.actionBody.orderSnapshot.isRenew != 'undefined') {
-            params.deliveryInfo.isRenew = datajson.actionBody.orderSnapshot.isRenew;//是否自动续费
+            params.baseInfo.isRenew = datajson.actionBody.orderSnapshot.isRenew;//是否自动续费
           }
           if (datajson.actionBody.orderSnapshot.memoInfo && datajson.actionBody.orderSnapshot.memoInfo != 'undefined') {
-            params.deliveryInfo.memoInfo = datajson.actionBody.orderSnapshot.memoInfo;
+            params.baseInfo.memoInfo = datajson.actionBody.orderSnapshot.memoInfo;
           }
           if (datajson.actionBody.orderSnapshot.whetherType && datajson.actionBody.orderSnapshot.whetherType != 'undefined') {
-            params.deliveryInfo.whetherType = datajson.actionBody.orderSnapshot.whetherType;//刻章类型
+            params.baseInfo.whetherType = datajson.actionBody.orderSnapshot.whetherType;//刻章类型
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("annualReport")){//年报信息
-            params.deliveryInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
+            params.baseInfo.annualReport = datajson.actionBody.orderSnapshot.annualReport;
           }
           if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) {//注册地址类型
             if (datajson.actionBody.orderSnapshot.addressType) {
-              params.deliveryInfo.addressType = "practical";
+              params.baseInfo.addressType = "practical";
             }
             else {
-              params.deliveryInfo.addressType = "virtual";
+              params.baseInfo.addressType = "virtual";
             }
           }
           if (datajson.actionBody.orderSnapshot.subjectType && datajson.actionBody.orderSnapshot.subjectType != 'undefined') {
-            params.deliveryInfo.subjectType = datajson.actionBody.orderSnapshot.subjectType;//代理记账主体类型
+            params.baseInfo.subjectType = datajson.actionBody.orderSnapshot.subjectType;//代理记账主体类型
           }
           if (datajson.actionBody.orderSnapshot.companyName && datajson.actionBody.orderSnapshot.companyName != 'undefined') {
-            params.deliveryInfo.companyName = datajson.actionBody.orderSnapshot.companyName;//公司名称
+            params.baseInfo.companyName = datajson.actionBody.orderSnapshot.companyName;//公司名称
             params.companyInfo.companyName = datajson.actionBody.orderSnapshot.companyName;
           }
           if (datajson.actionBody.orderSnapshot.companyProperties && datajson.actionBody.orderSnapshot.companyProperties != 'undefined') {