gyq

142336d7 · 王勇飞 · 6c2deca9 · 142336d7
Commit 142336d7 authored Jun 24, 2020 by 王勇飞
Show whitespace changes
Inline Side-by-side

Showing with 47 additions and 32 deletions

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

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
@@ -134,31 +134,51 @@ class TxHandler {
        }
      }
      else {
-        //获取分配的业务员信息
-        var salesmanInfo = await this.userService.getBizUserForDelivery(datajson.actionBody.orderSnapshot.contactsPhone, datajson.actionBody.servicerName, datajson.actionBody.productTypeName, datajson.actionBody.txPriceCode);
-        console.log("salesmanInfo-------------------------------------------------------" + JSON.stringify(salesmanInfo));
        var rc = system.getObject("util.execClient");
-        var requrl = this.icUrl + "/deliverybillCtl/insertInfo";
+        var requrl = this.icUrl + "/deliverybillCtl/findInfoByDeliverCode";
+        var delInfo = await rc.execPost3({ "d": { "deliverNumber": datajson.actionBody.orderNum } }, requrl);
+        console.log("jdelInfo---------------------------------------------" + delInfo.stdout);
+        var jdelInfo = JSON.parse(delInfo.stdout);
+        if (jdelInfo.status == 0) {
+          return {
+            "status": 1,    //1代表成功，否则失败
+            "msg": "数据已存在",
+            "data": "",
+            "requestId": ""
+          }
+        }
+        else {
+          //获取分配的业务员信息
+          var ConsultTypeName = "";
+          if (datajson.actionBody.productTypeName && datajson.actionBody.productTypeName != 'undefined'){
+            ConsultTypeName = datajson.actionBody.productTypeName.split("/")[2];
+          }
+          var salesmanInfo = await this.userService.getBizUserForDelivery(datajson.actionBody.orderSnapshot.contactsPhone, datajson.actionBody.servicerName, ConsultTypeName, datajson.actionBody.txPriceCode, datajson.actionBody.regionName);
+          requrl = this.icUrl + "/deliverybillCtl/insertInfo";
          var params = {
            "deliverNumber": datajson.actionBody.orderNum,
            "servicerName": datajson.actionBody.servicerName,
            "serviceCode": datajson.actionBody.regionId,
            "serviceName": datajson.actionBody.regionName,
            "businessType": datajson.actionBody.productType,
-          "businessName": datajson.actionBody.productTypeName,
+            "businessName": ConsultTypeName,
            "skuCode": datajson.actionBody.txPriceCode,
            "deliveryInfo": {
              "txOrderNum": datajson.actionBody.txOrderNum,
              "isAdviser": "已分配",//是否分配顾问
              "contactsName": datajson.actionBody.orderSnapshot.contactsName,
              "contactsPhone": datajson.actionBody.orderSnapshot.contactsPhone,
-            "payStatus": "待支付"
+              "payStatus": "待交付"
            },
-          "companyInfo": {}
+            "companyInfo": {},
+            "registeredInfo": {},
+            "positionInfo": {},
+            "regInfo": {},
+            "express_info": {}
          }
          if (salesmanInfo && salesmanInfo != 'undefined') {
-          params.salesmanOpcode = salesmanInfo.opath,
+            params.clerkOpcode = salesmanInfo.opath,
-          params.salesmanId = salesmanInfo.userId,
+              params.clerkId = salesmanInfo.userId,
              params.clerkName = salesmanInfo.userName,
              params.clerkPhone = salesmanInfo.mobile,
              params.costPrice = salesmanInfo.cost,
@@ -176,8 +196,13 @@ class TxHandler {
          if (datajson.actionBody.orderSnapshot.channelNumber && datajson.actionBody.orderSnapshot.channelNumber != 'undefined') {
            params.channelNumber = datajson.actionBody.orderSnapshot.channelNumber;//渠道编码
          }
-        if (datajson.actionBody.orderSnapshot.isWhether && datajson.actionBody.orderSnapshot.isWhether != 'undefined') {
+          if (datajson.actionBody.orderSnapshot.hasOwnProperty("isWhether")) {
-          params.deliveryInfo.isWhether = datajson.actionBody.orderSnapshot.isWhether;//是否刻章
+            if (datajson.actionBody.orderSnapshot.isWhether) {
+              params.deliveryInfo.isWhether = "是";//是否刻章
+            }
+            else {
+              params.deliveryInfo.isWhether = "否";//是否刻章
+            }
          }
          if (datajson.actionBody.orderSnapshot.financial && datajson.actionBody.orderSnapshot.financial != 'undefined') {
            params.deliveryInfo.financial = datajson.actionBody.orderSnapshot.financial;//财税服务
@@ -189,7 +214,7 @@ class TxHandler {
            params.deliveryInfo.businessLicense = datajson.actionBody.orderSnapshot.businessLicense;//营业执照扫描件
          }
          if (datajson.actionBody.orderSnapshot.taxpayerType && datajson.actionBody.orderSnapshot.taxpayerType != 'undefined') {
-          params.deliveryInfo.taxpayerType = datajson.actionBody.orderSnapshot.taxpayerType;//纳税人类型
+            params.deliveryInfo.taxpayerName = datajson.actionBody.orderSnapshot.taxpayerType;//纳税人类型名称
          }
          if (datajson.actionBody.orderSnapshot.buyDuration && datajson.actionBody.orderSnapshot.buyDuration != 'undefined') {
            params.deliveryInfo.buyDuration = datajson.actionBody.orderSnapshot.buyDuration;//购买时长
@@ -200,17 +225,17 @@ class TxHandler {
          if (datajson.actionBody.orderSnapshot.isRenew && datajson.actionBody.orderSnapshot.isRenew != 'undefined') {
            params.deliveryInfo.isRenew = datajson.actionBody.orderSnapshot.isRenew;//是否自动续费
          }
-        if (datajson.actionBody.orderSnapshot.memoInfo && datajson.actionBody.orderSnapshot.memoInfo != 'undefined'){
+          if (datajson.actionBody.orderSnapshot.memoInfo && datajson.actionBody.orderSnapshot.memoInfo != 'undefined') {
            params.deliveryInfo.memoInfo = datajson.actionBody.orderSnapshot.memoInfo;
          }
          if (datajson.actionBody.orderSnapshot.whetherType && datajson.actionBody.orderSnapshot.whetherType != 'undefined') {
            params.deliveryInfo.whetherType = datajson.actionBody.orderSnapshot.whetherType;//刻章类型
          }
-        if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")){//注册地址类型
+          if (datajson.actionBody.orderSnapshot.hasOwnProperty("addressType")) {//注册地址类型
-          if (datajson.actionBody.orderSnapshot.addressType){
+            if (datajson.actionBody.orderSnapshot.addressType) {
              params.deliveryInfo.addressType = "practical";
            }
-          else{
+            else {
              params.deliveryInfo.addressType = "virtual";
            }
          }
@@ -222,13 +247,13 @@ class TxHandler {
            params.companyInfo.companyName = datajson.actionBody.orderSnapshot.companyName;
          }
          if (datajson.actionBody.orderSnapshot.companyProperties && datajson.actionBody.orderSnapshot.companyProperties != 'undefined') {
-          params.companyInfo.companyProperties = datajson.actionBody.orderSnapshot.companyProperties;//公司性质
+            params.companyInfo.companyPropertiesName = datajson.actionBody.orderSnapshot.companyProperties;//公司性质名称
          }
          if (datajson.actionBody.orderSnapshot.fullAddress && datajson.actionBody.orderSnapshot.fullAddress != 'undefined') {
            params.companyInfo.fullAddress = datajson.actionBody.orderSnapshot.fullAddress;//详细地址
          }
          if (datajson.actionBody.orderSnapshot.engagedIndustry && datajson.actionBody.orderSnapshot.engagedIndustry != 'undefined') {
-          params.companyInfo.engagedIndustry = datajson.actionBody.orderSnapshot.engagedIndustry;//从事行业
+            params.companyInfo.engagedIndName = datajson.actionBody.orderSnapshot.engagedIndustry;//从事行业名称
          }
          if (datajson.actionBody.orderSnapshot.businessScope && datajson.actionBody.orderSnapshot.businessScope != 'undefined') {
            params.companyInfo.businessScope = datajson.actionBody.orderSnapshot.businessScope;//经营范围
@@ -240,17 +265,8 @@ class TxHandler {
            params.companyInfo.registeredCapital = datajson.actionBody.orderSnapshot.registeredCapital;//注册资本
          }
          if (datajson.actionBody.orderSnapshot.creditCode && datajson.actionBody.orderSnapshot.creditCode != 'undefined') {
-          params.companyInfo.creditCode = datajson.actionBody.order_snapshot.creditCode;//统一社会信用代码
+            params.companyInfo.creditCode = datajson.actionBody.orderSnapshot.creditCode;//统一社会信用代码
-        }
-        if (datajson.actionBody.orderSnapshot.companyType && datajson.actionBody.orderSnapshot.companyType != 'undefined') {
-          params.companyInfo.companyType = datajson.actionBody.orderSnapshot.companyType;//公司类型
          }
-        else{
-          if (params.companyInfo.companyProperties && params.companyInfo.companyProperties != 'undefined'){
-            params.companyInfo.companyType = params.companyInfo.companyProperties;
-          }
-        }
          if (datajson.actionBody.orderSnapshot.establishedTime && datajson.actionBody.orderSnapshot.establishedTime != 'undefined') {
            params.companyInfo.establishedTime = datajson.actionBody.orderSnapshot.establishedTime;//成立时间
          }
@@ -275,6 +291,7 @@ class TxHandler {
          }
        }
      }
+    }
    catch (error) {
      console.log("error-------------------------------------" + error);
      return system.getResultError(error);
@@ -308,7 +325,7 @@ class TxHandler {
        var rtn = await rc.execPost3(params, requrl);
        var j = JSON.parse(rtn.stdout);
        if (j.status == 0) {
-          await this.cacheManager["TxCache"].cache(cachestr,null,1200000);
+          await this.cacheManager["TxCache"].cache(cachestr, null, 1200000);
          return {
            "status": 1,    //1代表成功，否则失败
            "msg": "",
@@ -332,9 +349,7 @@ module.exports = new TxHandler();
 // (async ()=>{
 //   var task = new TxHandler();
-//   var ConsultTypeName = "/工商服务/刻章服务/".split("/")[2];
+//   var d = await task.userService.getBizUserForDelivery("16512345678","公司宝","公司注册","sv_business_registration_category_limited1","北京");
-//   console.log(ConsultTypeName);
-//   var d = await task.userService.getBizUserForBizChance("18222222222","猪八戒",ConsultTypeName,"济南");
 //   console.log("ddddddddddddd");
 //   console.log(JSON.stringify(d));
 //   console.log("dddddddddddddd");