Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

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

@@ -205,13 +205,13 @@ class QcCenterOrderService extends AppServiceBase {
   async serviceProviderNotification(pobj) {
   async serviceProviderNotification(pobj) {
     var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
     var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
     if (res && res.status == 0 && res.data) {
     if (res && res.status == 0 && res.data) {
-      pobj.actionType = "getPayOrderInfo";
+      pobj.actionType = "getOrderByOrderNo";
       let orderUrl = settings.centerOrderUrl() + "action/order/springBoard";
       let orderUrl = settings.centerOrderUrl() + "action/order/springBoard";
       let orderResult = await this.restPostUrl(pobj, orderUrl);
       let orderResult = await this.restPostUrl(pobj, orderUrl);
       if(orderResult.status !=0){
       if(orderResult.status !=0){
         return system.getResultFail(-1,'查询订单失败')
         return system.getResultFail(-1,'查询订单失败')
       }
       }
-      let uapp_id = orderResult.data.receiptVoucher.uapp_id;
+      let uapp_id = orderResult.data.uapp_id;
       pobj.appInfo = {uapp_id : uapp_id};
       pobj.appInfo = {uapp_id : uapp_id};
       pobj.actionType = "getAppInterface";
       pobj.actionType = "getAppInterface";
       var reqUrl = settings.centerAppUrl() + "action/opProduct/springBoard";
       var reqUrl = settings.centerAppUrl() + "action/opProduct/springBoard";

center-channel/app/base/service/impl/utilsSve/utils360Sve.js

@@ -81,14 +81,7 @@ class utils360Sve extends AppServiceBase {
             var interface_params_info = verifyResult.data;
             var interface_params_info = verifyResult.data;
             let token = await this.utilsAuthSve.get360Token();
             let token = await this.utilsAuthSve.get360Token();
             let url = interface_params_info.opUrl + '?token=' + token.access_token;
             let url = interface_params_info.opUrl + '?token=' + token.access_token;
-            //合同号，还是订单号
-            pobj.actionType = 'getOrderServiceNoByOrderNo'
-            let orderUrl = settings.centerOrderUrl() + 'action/order/springBoard'
-            let orderItem = await this.restPostUrl(pobj,orderUrl);
-            if(orderItem.status !=0){
-                return orderItem;
-            }
-            let order_id = orderItem.data.orderServiceNo;
+            let order_id = pobj.actionBody.orderNo;
             let ApplicationStatus = pobj.pushObj.ApplicationStatus;
             let ApplicationStatus = pobj.pushObj.ApplicationStatus;
             let status = 0;
             let status = 0;
             if (Number(ApplicationStatus) < 508) {
             if (Number(ApplicationStatus) < 508) {