laolan

center-channel/app/base/api/impl/action/regapi.js

@@ -25,6 +25,9 @@ class RegAPI extends APIBase {
         switch (action_type) {
             //-----------接入百度reg------start----laolan--2020.12.17----------------------------
             //---------2.
+            case "selectNeedInfo"://查询需求信息
+                opResult = await this.regCenterOrderSve.selectNeedInfo(pobj, pobj.actionBody);
+                break;
             case "submitRegNeed"://提交需求
                 opResult = await this.regCenterOrderSve.submitRegNeed(pobj, pobj.actionBody);
                 break;

center-channel/app/base/service/impl/common/regCenterOrderSve.js

@@ -28,144 +28,151 @@ class RegCenterOrderService extends AppServiceBase {
   }
 
 
-//-----------接入百度reg-----start--------laolan---2020.12.17----------------------
-async getSolutionByChannelOrderNo(pobj, actionBody) {
-  if (!actionBody.orderNo) {
-    return system.getResult(null, "actionBody.orderNo can not be empty，100390");
-  }
-  var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
-  var itemResult = await this.restPostUrl(pobj, reqUrl);
-  return itemResult;
-}
-async regPaySuccess(pobj) {
-  console.log('regPaySuccess++++pobj----',pobj)
-  var sobj = {
-    actionType: "getRegProducePrice",
-    actionBody: { 
-      typeCode: pobj.actionBody.channelTypeCode, 
-      city: pobj.actionBody.area,
-      taxpayerType:pobj.actionBody.taxpayerType,
-      companyProperties:pobj.actionBody.companyProperties 
-    },
-      appInfo: pobj.appInfo,
-      actionProcess: pobj.actionProcess
-  }
-  console.log('regPaySuccess++++sobj----',sobj)
-  var url = settings.centerAppUrl() + "action/opProduct/springBoard";
-  var rtn = await this.execClient.execPost(sobj, url);
-  if (!rtn || !rtn.stdout) {
-    return system.getResultFail(-5010, "产品查询失败");
-  }
-  var data = JSON.parse(rtn.stdout);
-  if (data.status != 0) {
-    return system.getResultFail(-5010, "产品查询失败");
-  }
-  console.log('data----data----',data)
-  // pobj.actionBody = data.data;
-  // pobj.actionBody.orderNo = pobj.actionBody.bizId;
-  pobj.actionBody.totalSum = data.data.price;
-  pobj.actionBody.orderPrice = data.data.price;
-  pobj.actionBody.payTotalSum = data.data.price;
-  pobj.actionBody.payCode = data.data.payCode;
-  pobj.actionBody.channelItemCode = data.data.channelItemCode;
-  pobj.actionBody.channelNeedNo = data.data.channelNeedNo || data.data.bizId ;
-  pobj.actionBody.needNo = data.data.needNo;
-  pobj.actionBody.quantity = 1;
-  pobj.actionBody.channelOrder = {
-    channelServiceNo: pobj.actionBody.orderNo,
-    channelOrderNo: pobj.actionBody.orderNo,
-    orderStatus: 2
+  //-----------接入百度reg-----start--------laolan---2020.12.17----------------------
+  async getSolutionByChannelOrderNo(pobj, actionBody) {
+    if (!actionBody.orderNo) {
+      return system.getResult(null, "actionBody.orderNo can not be empty，100390");
+    }
+    var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
+    var itemResult = await this.restPostUrl(pobj, reqUrl);
+    return itemResult;
   }
-  console.log('pobj.actionBody------',pobj.actionBody)
+  async regPaySuccess(pobj) {
+    console.log('regPaySuccess++++pobj----',pobj)
+    var sobj = {
+      actionType: "getRegProducePrice",
+      actionBody: { 
+        typeCode: pobj.actionBody.consultType, 
+        city: pobj.actionBody.area,
+        taxpayerType:pobj.actionBody.taxpayerType,
+        companyProperties:pobj.actionBody.companyProperties 
+      },
+        appInfo: pobj.appInfo,
+        actionProcess: pobj.actionProcess
+    }
+    console.log('regPaySuccess++++sobj----',sobj)
+    var url = settings.centerAppUrl() + "action/opProduct/springBoard";
+    var rtn = await this.execClient.execPost(sobj, url);
+    if (!rtn || !rtn.stdout) {
+      return system.getResultFail(-5010, "产品查询失败");
+    }
+    var data = JSON.parse(rtn.stdout);
+    if (data.status != 0) {
+      return system.getResultFail(-5010, "产品查询失败");
+    }
+    console.log('data----data----',data)
+    // pobj.actionBody = data.data;
+    // pobj.actionBody.orderNo = pobj.actionBody.bizId;
+    pobj.actionBody.totalSum = data.data.price;
+    pobj.actionBody.orderPrice = data.data.price;
+    pobj.actionBody.payTotalSum = data.data.price;
+    pobj.actionBody.payCode = data.data.payCode;
+    pobj.actionBody.channelItemCode = data.data.channelItemCode;
+    pobj.actionBody.channelNeedNo = data.data.channelNeedNo || data.data.bizId ;
+    pobj.actionBody.needNo = data.data.needNo;
+    pobj.actionBody.quantity = 1;
+    pobj.actionBody.channelOrder = {
+      channelServiceNo: pobj.actionBody.orderNo,
+      channelOrderNo: pobj.actionBody.orderNo,
+      orderStatus: 2
+    }
+    console.log('pobj.actionBody------',pobj.actionBody)
 
-  var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
-  console.log('orderrtn----',orderrtn)
-  if (orderrtn.status != 0 && orderrtn.status != -1) {
-    return system.getResultFail(-5012, "订单创建失败");
-  }
-  if (orderrtn.data) {
-    pobj.actionBody.orderNo = orderrtn.data.orderNo;
-  }
-  pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
+    var orderrtn = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
+    console.log('orderrtn----',orderrtn)
+    if (orderrtn.status != 0 && orderrtn.status != -1) {
+      return system.getResultFail(-5012, "订单创建失败");
+    }
+    if (orderrtn.data) {
+      pobj.actionBody.orderNo = orderrtn.data.orderNo;
+    }
+    pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
 
-  pobj.actionType = "regReceiveSolutionPayInfo";
-  var url = settings.centerOrderUrl() + "action/regapi/springBoard";
-  var solutionrtn = await this.execClient.execPost(pobj, url);
-  if (!solutionrtn || !solutionrtn.stdout) {
-    return system.getResultFail(-5011, "方案查询失败");
-  }
-  var solutiondata = JSON.parse(solutionrtn.stdout);
-  console.log('solutiondata----',solutiondata)
-  if (solutiondata.status != 0) {
-    return system.getResultFail(-5011, "方案查询失败");
-  }
-  if (!solutiondata.data) {
-    return system.getResultFail(-5012, "方案查询数据为空");
-  }
-  if (solutiondata.data && solutiondata.data.channelNeedNo) {
-    pobj.actionBody.needId = solutiondata.data.channelNeedNo;
-  }
-  if (pobj.actionBody.channelItemCode) {
-    pobj.actionBody.channelItemCode = regCfg.channelTypeCode[pobj.actionBody.channelItemCode];
-  }
-  var fqobj = {
-    actionBody: {
-      area: pobj.actionBody.province,
-      idempotentSource: data.data.serviceBusinessCode,
-      orderNo: pobj.actionBody.channelOrder.channelOrderNo,
-      orderPrice: Number(pobj.actionBody.orderPrice / 100),
-      phone: pobj.actionBody.publishMobile,
-      needId: solutiondata.data.channelNeedNo
-      // companyName:solutiondata.data.solutionContent.CompanyName || ''
-    },
-    appInfo: pobj.appInfo
-  }
-  console.log('fqobj----',fqobj)
-  var baiduPushRes = await this.utilsPushSve.baiduBusiness2Fq(fqobj, "pushOrderICPBusinessNew");
-  var deliveryObj = {
-    actionBody: {
-      orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
-      needsolution: solutiondata.data.solutionContent,
-      channelNeedNo: solutiondata.data.channelNeedNo,
-      channelSolutionNo: solutiondata.data.channelSolutionNo,
-      skuCode: data.data.payCode,
-      servicer: {
-        code: 'gsb',
-        name: '公司宝'
-      }
-    },
-    appInfo: pobj.appInfo
-  };
-  if(pobj.actionBody.isDirectBuy && pobj.actionBody.isDirectBuy==1){//直接下单需执行添加订单业务员操作
-    if(baiduPushRes && baiduPushRes.status==0){
-      if(baiduPushRes.data && baiduPushRes.data.data){
-        var resData = baiduPushRes.data.data;
-        var salesmanInfo = {
-          salesmanName:resData.orderList && resData.orderList.length>0?resData.orderList[0].operatorName:"",
-          salesmanChannelId:resData.orderList && resData.orderList.length>0?resData.orderList[0].operator:"",
-        };
-        var salesmanObj={
-          appInfo:pobj.appInfo,
-          actionType:"addRegSalesmanInfo",//添加业务员信息
-          actionBody:{salesmanInfo:salesmanInfo,orderNo:orderrtn.data.orderNo}
-        }; 
-        var url = settings.centerOrderUrl() + "action/regapi/springBoard";
-        var addRes = await this.execClient.execPost(salesmanObj, url);
-        if (addRes && addRes.stdout) {
-          var salesmanRes = JSON.parse(addRes.stdout);
-          if (salesmanRes.status == 0) {
-            deliveryObj.actionBody.needsolution = salesmanRes.data;
-            await this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
+    pobj.actionType = "regReceiveSolutionPayInfo";
+    var url = settings.centerOrderUrl() + "action/regapi/springBoard";
+    var solutionrtn = await this.execClient.execPost(pobj, url);
+    if (!solutionrtn || !solutionrtn.stdout) {
+      return system.getResultFail(-5011, "方案查询失败");
+    }
+    var solutiondata = JSON.parse(solutionrtn.stdout);
+    console.log('solutiondata----',solutiondata)
+    if (solutiondata.status != 0) {
+      return system.getResultFail(-5011, "方案查询失败");
+    }
+    if (!solutiondata.data) {
+      return system.getResultFail(-5012, "方案查询数据为空");
+    }
+    if (solutiondata.data && solutiondata.data.channelNeedNo) {
+      pobj.actionBody.needId = solutiondata.data.channelNeedNo;
+    }
+    if (pobj.actionBody.channelItemCode) {
+      pobj.actionBody.channelItemCode = regCfg.channelTypeCode[pobj.actionBody.channelItemCode];
+    }
+    var fqobj = {
+      actionBody: {
+        area: pobj.actionBody.province,
+        idempotentSource: data.data.serviceBusinessCode,
+        orderNo: pobj.actionBody.channelOrder.channelOrderNo,
+        orderPrice: Number(pobj.actionBody.orderPrice / 100),
+        phone: pobj.actionBody.publishMobile,
+        needId: solutiondata.data.channelNeedNo
+        // companyName:solutiondata.data.solutionContent.CompanyName || ''
+      },
+      appInfo: pobj.appInfo
+    }
+    console.log('fqobj----',fqobj)
+    var baiduPushRes = await this.utilsPushSve.baiduBusiness2Fq(fqobj, "pushOrderICPBusinessNew");
+    var deliveryObj = {
+      actionBody: {
+        orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
+        needsolution: solutiondata.data.solutionContent,
+        channelNeedNo: solutiondata.data.channelNeedNo,
+        channelSolutionNo: solutiondata.data.channelSolutionNo,
+        skuCode: data.data.payCode,
+        servicer: {
+          code: 'gsb',
+          name: '公司宝'
+        }
+      },
+      appInfo: pobj.appInfo
+    };
+    if(pobj.actionBody.isDirectBuy && pobj.actionBody.isDirectBuy==1){//直接下单需执行添加订单业务员操作
+      if(baiduPushRes && baiduPushRes.status==0){
+        if(baiduPushRes.data && baiduPushRes.data.data){
+          var resData = baiduPushRes.data.data;
+          var salesmanInfo = {
+            salesmanName:resData.orderList && resData.orderList.length>0?resData.orderList[0].operatorName:"",
+            salesmanChannelId:resData.orderList && resData.orderList.length>0?resData.orderList[0].operator:"",
+          };
+          var salesmanObj={
+            appInfo:pobj.appInfo,
+            actionType:"addRegSalesmanInfo",//添加业务员信息
+            actionBody:{salesmanInfo:salesmanInfo,orderNo:orderrtn.data.orderNo}
+          }; 
+          var url = settings.centerOrderUrl() + "action/regapi/springBoard";
+          var addRes = await this.execClient.execPost(salesmanObj, url);
+          if (addRes && addRes.stdout) {
+            var salesmanRes = JSON.parse(addRes.stdout);
+            if (salesmanRes.status == 0) {
+              deliveryObj.actionBody.needsolution = salesmanRes.data;
+              await this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
+            }
           }
+          
         }
-        
       }
+    }else{
+      this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
     }
-  }else{
-    this.utilsPushSve.baiduBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
+    return system.getResultSuccess();
+  }
+
+  // channelNeedNo获取需求详情 
+  async selectNeedInfo(pobj){
+    var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
+    var itemResult = await this.restPostUrl(pobj, reqUrl);
+    return itemResult;
   }
-  return system.getResultSuccess();
-}
   /**
     * 获取方案详情
     * @param {*} pobj
@@ -185,10 +192,7 @@ async regPaySuccess(pobj) {
   * @param {*} pobj
   * @param {*} actionBody bizId 渠道方案号
   */
-  async getItemByChannelSolutionNo(pobj, actionBody) {
-    if (!actionBody.bizId) {
-      return system.getResult(null, "actionBody.bizId can not be empty，100390");
-    }
+  async getItemByChannelSolutionNo(pobj) {
     var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
     var itemResult = await this.restPostUrl(pobj, reqUrl);
     return itemResult;
@@ -256,27 +260,27 @@ async regPaySuccess(pobj) {
   }
 
   //reg需求反馈 2.2
-async regFeedbackSubmit(pobj, reqUrl) {
-  var url = this.centerOrderUrl + "action/regapi/springBoard";
-  if (reqUrl) {
-    var url = this.centerOrderUrl + reqUrl;
-  }
-  var self = this;
-  pobj.actionType = "regFeedbackSubmit";
-  if (pobj.actionBody && pobj.actionBody.intentionStatus) {
-    pobj.intentionStatus = pobj.actionBody.intentionStatus;
-  }
-  var rtn = await this.execClient.execPost(pobj, url);
- 
-  if (pobj.intentionStatus) {
-    // 如果需求当前字段为5（已关闭）则通知fq
-    if (pobj.intentionStatus == 5) {
-      self.utilsPushSve.baiduBusiness2Fq(pobj, "pushCloseICPNeed");
+  async regFeedbackSubmit(pobj, reqUrl) {
+    var url = this.centerOrderUrl + "action/regapi/springBoard";
+    if (reqUrl) {
+      var url = this.centerOrderUrl + reqUrl;
+    }
+    var self = this;
+    pobj.actionType = "regFeedbackSubmit";
+    if (pobj.actionBody && pobj.actionBody.intentionStatus) {
+      pobj.intentionStatus = pobj.actionBody.intentionStatus;
     }
+    var rtn = await this.execClient.execPost(pobj, url);
+  
+    if (pobj.intentionStatus) {
+      // 如果需求当前字段为5（已关闭）则通知fq
+      if (pobj.intentionStatus == 5) {
+        self.utilsPushSve.baiduBusiness2Fq(pobj, "pushCloseICPNeed");
+      }
+    }
+    var data = JSON.parse(rtn.stdout);
+    return data;
   }
-  var data = JSON.parse(rtn.stdout);
-  return data;
-}
   //状态更新
   async regOrderStatus(pobj) {
     var actionBody = pobj.actionBody;
@@ -533,12 +537,17 @@ async regFeedbackSubmit(pobj, reqUrl) {
     if (res && res.status == 0 && res.data) {
       var  deliverContent
       if( pobj.actionBody.deliverContent){
+        if(pobj.actionBody.deliverContent.companyInfo && pobj.actionBody.deliverContent.companyInfo.serviceArea){
+          pobj.actionBody.deliverContent.companyInfo.serviceArea = regCfg.baiduAreaCode[pobj.actionBody.deliverContent.companyInfo.serviceArea]
+        }
         deliverContent = {
           applicationFormUrl:pobj.actionBody.deliverContent.applicationFormUrl || "",//公司注册申请登记表文件
           registDocumentsUrl:pobj.actionBody.deliverContent.registDocumentsUrl || "",//注册文件
           baseInfo:pobj.actionBody.deliverContent.baseInfo || {},//基本信息
           companyInfo:pobj.actionBody.deliverContent.companyInfo || {}//公司信息
         }
+      }else{
+        deliverContent = {}
       }
       if(res.data.uapp_id == regCfg.uappId.baidu){
         //推送数据至百度