wancheng

73b61eb4 · 兰国旗 · 3c1e4e62 · 73b61eb4 · 73b61eb4 · 73b61eb4
Commit 73b61eb4 authored Nov 07, 2020 by 兰国旗
5 changed files
--- a/center-channel/app/base/api/impl/action/qcapi.js
+++ b/center-channel/app/base/api/impl/action/qcapi.js
@@ -5,6 +5,7 @@ class QcAPI extends APIBase {
    constructor() {
        super();
        this.qcCenterOrderSve = system.getObject("service.common.qcCenterOrderSve");
+        this.baseOrderSve = system.getObject("service.common.baseCenterOrderSve");
    }
    /**
      * 接口跳转-POST请求
@@ -26,7 +27,7 @@ class QcAPI extends APIBase {
                opResult = await this.qcCenterOrderSve.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
                break;
            case "submitIcpProgramme"://icp方案提交
-                opResult = await this.qcCenterOrderSve.submitIcpProgramme(pobj);
+                opResult = await this.baseOrderSve.submitIcpProgramme(pobj);
                break;
            case "receiveProgrammeNo"://接收渠道方案号（测试）
                opResult = await this.qcCenterOrderSve.reqCenterOrderApi(pobj);
@@ -44,10 +45,10 @@ class QcAPI extends APIBase {
                opResult = await this.qcCenterOrderSve.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
                break;
            case "serviceProviderSubmitMaterial"://交付商提交材料信息
-                opResult = await this.qcCenterOrderSve.serviceProviderSubmitMaterial(pobj);
+                opResult = await this.baseOrderSve.serviceProviderSubmitMaterial(pobj);
                break;
            case "serviceProviderNotification"://交付商通知状态变更
-                opResult = await this.qcCenterOrderSve.serviceProviderNotification(pobj);
+                opResult = await this.baseOrderSve.serviceProviderNotification(pobj);
                break;
            case "closeOrderDelivery"://交付商关闭交付单
                opResult = await this.qcCenterOrderSve.closeOrderDelivery(pobj);

--- a/center-channel/app/base/api/impl/action/qcapi2.js
+++ b/center-channel/app/base/api/impl/action/qcapi2.js
@@ -25,13 +25,13 @@ class QcAPI2 extends APIBase {
        var opResult = null;
        switch (action_type) {
            case "getNeedSolutionDetailByUser"://获取方案详情
-                opResult = await this.baseOrderSve.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+                opResult = await this.centerorderSve.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
                break;
            case "submitIcpProgramme"://icp方案提交
                opResult = await this.baseOrderSve.submitIcpProgramme(pobj);
                break;
            case "receiveProgrammeNo"://接收渠道方案号（测试）
-                opResult = await this.baseOrderSve.reqCenterOrderApi(pobj);
+                opResult = await this.centerorderSve.reqCenterOrderApi(pobj);
                break;
            // case "submitIcpMaterial"://icp材料提交
            //     opResult = await this.baseOrderSve.submitIcpMaterial(pobj);
@@ -40,10 +40,10 @@ class QcAPI2 extends APIBase {
            //     opResult = await this.baseOrderSve.acceptIcpPartnerNotification(pobj);
            //     break;
            case "abolishIcpProgramme"://服务商icp方案关闭
-                opResult = await this.baseOrderSve.abolishIcpProgramme(pobj);
+                opResult = await this.centerorderSve.abolishIcpProgramme(pobj);
                break;
            case "getProgrammeInfoByChannelNeedNo"://获取需求方案列表
-                opResult = await this.baseOrderSve.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+                opResult = await this.centerorderSve.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
                break;
            case "serviceProviderSubmitMaterial"://交付商提交材料信息
                opResult = await this.baseOrderSve.serviceProviderSubmitMaterial(pobj);
@@ -52,7 +52,7 @@ class QcAPI2 extends APIBase {
                opResult = await this.baseOrderSve.serviceProviderNotification(pobj);
                break;
            case "closeOrderDelivery"://交付商关闭交付单
-                opResult = await this.baseOrderSve.closeOrderDelivery(pobj);
+                opResult = await this.centerorderSve.closeOrderDelivery(pobj);
                break;
            // --------- 文网文 ---------

--- a/center-channel/app/base/api/impl/opreceive/need.js
+++ b/center-channel/app/base/api/impl/opreceive/need.js
@@ -6,6 +6,8 @@ class Need extends APIBase {
        super();
        this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
        this.centerorderSve = system.getObject("service.common.centerorderSve");
+        this.utilsNeedSve2 = system.getObject("service.utilsSve.utilsNeedSve2");
    }
    /**
@@ -40,7 +42,7 @@ class Need extends APIBase {
                opResult = await this.utilsNeedSve.needClose(pobj, pobj.actionBody);
                break;
            case "needCloseIcp"://关闭需求
-                opResult = await this.utilsNeedSve.needCloseIcp(pobj, pobj.actionBody);
+                opResult = await this.utilsNeedSve2.needCloseIcp(pobj, pobj.actionBody);
                break;
            case "needDetailByChannelNo":
                opResult = await this.utilsNeedSve.needDetailByChannelNo(pobj, pobj.actionBody);
@@ -68,10 +70,10 @@ class Need extends APIBase {
                }
                break;
            case "writeCommunicationLog"://icp接收方案反馈信息
-                opResult = await this.utilsNeedSve.writeCommunicationLog(pobj);
+                opResult = await this.utilsNeedSve2.writeCommunicationLog(pobj);
                break;
            case "queryExpertApplyCommunicationLogs"://icp接收方案反馈信息
-                opResult = await this.utilsNeedSve.queryExpertApplyCommunicationLogs(pobj);
+                opResult = await this.utilsNeedSve2.queryExpertApplyCommunicationLogs(pobj);
                break;
            case "getaliicpProduce"://方案询价
                opResult = await this.centerorderSve.getaliicpProduce(pobj);

--- a/center-channel/app/base/service/impl/common/baseCenterOrderSve.js
+++ b/center-channel/app/base/service/impl/common/baseCenterOrderSve.js
@@ -80,7 +80,7 @@ class BaseCenterOrderService extends AppServiceBase {
  };
  //调用center-order 
  async reqCenterOrderApi(pobj, reqUrl) {
-    var url = this.centerOrderUrl + "action/baseapi/springBoard";
+    var url = this.centerOrderUrl + "action/qcapi/springBoard";
    if (reqUrl) {
      var url = this.centerOrderUrl + reqUrl;
    }
@@ -247,7 +247,7 @@ class BaseCenterOrderService extends AppServiceBase {
  //服务商icp方案关闭 2020-10-26 laolan
  async abolishIcpProgramme(pobj) {
-    var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
      var needsolution = res.data;//方案信息
      var ab = pobj.actionBody;
@@ -305,15 +305,15 @@ class BaseCenterOrderService extends AppServiceBase {
        console.log('BizId++',BizId)
        var pushObj = {
          "businessLicense" : {
-            "createdAt" : material.BusinessLicense.CreatedAt,
+            "createdAt" : material.BusinessLicense.CreatedAt || "",
-            "enterpriseCode" :material.BusinessLicense.EnterpriseCode,
+            "enterpriseCode" :material.BusinessLicense.EnterpriseCode || "",
-            "legalRepresentative" :material.BusinessLicense.LegalRepresentative,
+            "legalRepresentative" :material.BusinessLicense.LegalRepresentative || "",
-            "address" :material.BusinessLicense.Address,
+            "address" :material.BusinessLicense.Address || "",
-            "registeredCapital" : material.BusinessLicense.RegisteredCapital,
+            "registeredCapital" : material.BusinessLicense.RegisteredCapital || "",
-            "name" :material.BusinessLicense.Name,
+            "name" :material.BusinessLicense.Name || "",
-            "businessTerm" :material.BusinessLicense.BusinessTerm,
+            "businessTerm" :material.BusinessLicense.BusinessTerm || "",
-            "type" : material.BusinessLicense.Type,
+            "type" : material.BusinessLicense.Type || "",
-            "scopeBusiness" :material.BusinessLicense.ScopeBusiness
+            "scopeBusiness" :material.BusinessLicense.ScopeBusiness || ""
          },
          "partnerForeignInvestment": material.PartnerForeignInvestment || "",
          "orderNo": BizId,
@@ -371,7 +371,7 @@ class BaseCenterOrderService extends AppServiceBase {
  }
  //交付单关闭
  async closeOrderDelivery(pobj) {
-    var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
      var needsolution = res.data;//方案信息
      var ab = pobj.actionBody;
@@ -390,7 +390,7 @@ class BaseCenterOrderService extends AppServiceBase {
  //服务商提交服务操作(文网文)2020-9-26
  async serviceSubmitOption(pobj) {
-    var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
      //推送数据至阿里
      var resStatus = res.data.ApplicationStatus;
@@ -412,7 +412,7 @@ class BaseCenterOrderService extends AppServiceBase {
  //提交方案(文网文)2020-9-27
  async submitWangwenSolution(pobj) {
    console.log('文网文提交方案',pobj)
-    var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
      console.log('www',res.data.needsolution.solutionContent);
      var solution = res.data.needsolution.solutionContent;
@@ -490,7 +490,7 @@ class BaseCenterOrderService extends AppServiceBase {
    var self = this;
    pobj.actionBody.intentionBizId = pobj.actionBody.needNo;
    pobj.actionType = "abolishIcpProgrammeByNeed"
-    var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('www+++result',result)
    if (result.status == 0) {
@@ -545,7 +545,7 @@ class BaseCenterOrderService extends AppServiceBase {
  //提交沟通记录
  async recordLog(pobj) {
    console.log('提交沟通记录pobj',pobj)
-    var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (!pobj.actionBody.needNo) {
      return system.getResult(null, "actionBody.needNo can not be empty，100491");
    }
@@ -553,7 +553,7 @@ class BaseCenterOrderService extends AppServiceBase {
      return system.getResult(null, "actionBody.note can not be empty，100492");
    }
    var self = this;
-    var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('www+提交沟通记录result',result)
    //推送交付系统
@@ -607,7 +607,7 @@ class BaseCenterOrderService extends AppServiceBase {
 //服务商提交服务操作
 async foodServiceSubmitOption(pobj) {
-  var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+  var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
  if (res && res.status == 0 && res.data) {
    //推送数据至阿里
    var resStatus = res.data.ApplicationStatus;
@@ -628,7 +628,7 @@ async foodServiceSubmitOption(pobj) {
 //提交方案
 async submitFoodSolution(pobj) {
  console.log('food+++pobj',pobj)
-  var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+  var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
  console.log('food+++res',res)
  if (res && res.status == 0 && res.data) {
    console.log('food',res.data.needsolution.solutionContent);
@@ -686,7 +686,7 @@ async foodCloseNeed(pobj) {
  var self = this;
  pobj.actionBody.intentionBizId = pobj.actionBody.needNo;
  pobj.actionType = "abolishIcpProgrammeByNeed"
-  var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+  var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
  var result = await this.restPostUrl(pobj, reqUrl);
  console.log('food+++result',result)
  if (result.status == 0) {
@@ -731,7 +731,7 @@ async foodCloseNeed(pobj) {
 //提交沟通记录
 async foodRecordLog(pobj) {
  console.log('提交沟通记录pobj',pobj)
-  var res = await this.reqCenterOrderApi(pobj, "action/baseapi/springBoard");
+  var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
  if (!pobj.actionBody.needNo) {
    return system.getResult(null, "actionBody.needNo can not be empty，100491");
  }
@@ -739,7 +739,7 @@ async foodRecordLog(pobj) {
    return system.getResult(null, "actionBody.note can not be empty，100492");
  }
  var self = this;
-  var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+  var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
  var result = await this.restPostUrl(pobj, reqUrl);
  console.log('提交沟通记录result',result)
  //推送交付系统

--- a/center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
@@ -222,7 +222,7 @@ class UtilsNeedService2 extends AppServiceBase {
    // 2020 1016 lin 新增 需求关闭时判断 方案状态 订单状态，打个比方如果已经生成订单了 那么肯定不能直接关闭需求
    var self = this;
    pobj.actionType = "abolishIcpProgrammeByNeed"
-    var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    // 2020 1015 lin 新增 这里为什么只推送蜂擎 没有推送交付？
    // 明天找栋源确认 如果需要增加 在这个文件搜索updateChanceStatus
@@ -268,7 +268,7 @@ class UtilsNeedService2 extends AppServiceBase {
    var self = this;
    pobj.actionBody.intentionBizId = pobj.actionBody.channelNeedNo;
    pobj.actionType = "abolishIcpProgrammeByNeed"
-    var reqUrl = this.centerOrderUrl + "action/baseapi/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    this.logCtl.info({
      appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
@@ -496,7 +496,7 @@ class UtilsNeedService2 extends AppServiceBase {
      return system.getResult(null, "actionBody.note can not be empty，100492");
    }
    var self = this;
-    var reqUrl = this.centerOrderUrl + "action/need2/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/need/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    //2020-10-28 laolan start 
    if(result && result.status == 0 && result.data){
@@ -541,7 +541,7 @@ class UtilsNeedService2 extends AppServiceBase {
    //   return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
    // }
    //2020-10-28 laolan start 
-    var reqUrl = this.centerOrderUrl + "action/need2/springBoard";
+    var reqUrl = this.centerOrderUrl + "action/need/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('jilu+++result++++',result)
    if(result && result.status == 0 && result.data && result.data.uapp_id){
@@ -662,7 +662,7 @@ class UtilsNeedService2 extends AppServiceBase {
    pobj.actionBody.data = [];
    await this.queryByAli(pobj, 1);
    pobj.actionType = "getUnCreated";
-    let reqUrl = this.centerOrderUrl + "action/need2/springBoard";
+    let reqUrl = this.centerOrderUrl + "action/need/springBoard";
    let result = await this.restPostUrl(pobj, reqUrl);
    if (result.status == 0) {
      pobj.actionBody = {