laolan

61d38797 · 兰国旗 · 46f55ec0 · 61d38797 · 61d38797
Commit 61d38797 authored Dec 24, 2020 by 兰国旗
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 6 deletions

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

center-channel/app/config/businessConfig.js
+4 -2

No files found.
--- a/center-channel/app/base/service/impl/common/regCenterOrderSve.js
+++ b/center-channel/app/base/service/impl/common/regCenterOrderSve.js
@@ -29,6 +29,14 @@ 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 = {
@@ -52,6 +60,7 @@ async regPaySuccess(pobj) {
  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;
@@ -59,7 +68,7 @@ async regPaySuccess(pobj) {
  pobj.actionBody.payTotalSum = data.data.price;
  pobj.actionBody.payCode = data.data.payCode;
  pobj.actionBody.channelItemCode = data.data.channelItemCode;
-  pobj.actionBody.channelNeedNo = data.data.channelNeedNo;
+  pobj.actionBody.channelNeedNo = data.data.channelNeedNo || data.data.bizId ;
  pobj.actionBody.needNo = data.data.needNo;
  pobj.actionBody.quantity = 1;
  pobj.actionBody.channelOrder = {
@@ -67,7 +76,10 @@ async regPaySuccess(pobj) {
    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, "订单创建失败");
  }
@@ -77,7 +89,7 @@ async regPaySuccess(pobj) {
  pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
  pobj.actionType = "regReceiveSolutionPayInfo";
-  var url = settings.centerOrderUrl() + "action/regCenterOrder/springBoard";
+  var url = settings.centerOrderUrl() + "action/regapi/springBoard";
  var solutionrtn = await this.execClient.execPost(pobj, url);
  if (!solutionrtn || !solutionrtn.stdout) {
    return system.getResultFail(-5011, "方案查询失败");
@@ -135,7 +147,7 @@ async regPaySuccess(pobj) {
          actionType:"addRegSalesmanInfo",//添加业务员信息
          actionBody:{salesmanInfo:salesmanInfo,orderNo:orderrtn.data.orderNo}
        }; 
-        var url = settings.centerOrderUrl() + "action/regCenterOrder/springBoard";
+        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);
@@ -370,7 +382,7 @@ async regFeedbackSubmit(pobj, reqUrl) {
  //通知交付状态变更
  // async serviceProviderNotification(pobj) {
  //   console.log('zhuangtai ++++',pobj)
-  //   var res = await this.reqCenterOrderApi(pobj, "action/regCenterOrder/springBoard");
+  //   var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
  //   if (res && res.status == 0 && res.data) {
  //     if(res.data.uapp_id == regCfg.uappId.baidu){
  //       res.data.ApplicationStatus = baiduRegStatus[res.data.ApplicationStatus];

--- a/center-channel/app/config/businessConfig.js
+++ b/center-channel/app/config/businessConfig.js
@@ -19,7 +19,8 @@ module.exports = {
            "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo", "putUserMobileByVcode",
            "putUserPwdByMobile", "icpNotifyNew",
            //百度工商注册
-            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regGetInfoByChannelNeedNo"
+            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose","getSolutionByChannelOrderNo",
+            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regPaySuccess"
        ],
        apiMustUserpinList: [
            "icpOrderClose",
@@ -28,7 +29,8 @@ module.exports = {
            "ncSubmitMaterial","ncNotification","ncSubmitSolution","ncCloseNeed","ncClosePlan",
            "rtSubmitMaterial","rtNotification","rtSubmitSolution","rtCloseNeed","rtClosePlan",
            //百度工商注册
-            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regGetInfoByChannelNeedNo"
+            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose","getSolutionByChannelOrderNo",
+            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regPaySuccess"
        ],
        apiSecretPathList: [
            "/api/icp/consultation/submit",