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

center-channel/app/base/api/impl/opreceive/accessAuth.js

@@ -84,11 +84,8 @@ class AccessAuthAPI extends APIBase {
     async getAppTokenByHosts(pobj, qobj, req) {
     async getAppTokenByHosts(pobj, qobj, req) {
         var token = this.getUUID();
         var token = this.getUUID();
         pobj.actionBody.reqType = "hosts";
         pobj.actionBody.reqType = "hosts";
-        var opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
-        if (opResult.status != 0) {
-            return opResult;
-        }
-        return system.getResultSuccess({ token: token })
+        let opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
+        return opResult;
     }
     }
     /**
     /**
       * 接口跳转-POST请求
       * 接口跳转-POST请求
@@ -97,11 +94,8 @@ class AccessAuthAPI extends APIBase {
     async getAppTokenByAppKey(pobj, qobj, req) {
     async getAppTokenByAppKey(pobj, qobj, req) {
         var token = this.getUUID();
         var token = this.getUUID();
         pobj.actionBody.reqType = "appkey";
         pobj.actionBody.reqType = "appkey";
-        var opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
-        if (opResult.status != 0) {
-            return opResult;
-        }
-        return system.getResultSuccess({ token: token })
+        let opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
+        return opResult;
     }
     }
 }
 }
 module.exports = AccessAuthAPI;
 module.exports = AccessAuthAPI;
\ No newline at end of file

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

@@ -60,7 +60,7 @@ class QcCenterOrderService extends AppServiceBase {
         IntentionBizId: needinfo.channelNeedNo,
         IntentionBizId: needinfo.channelNeedNo,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         Area: solution.Area, Note: solution.Note,
         Area: solution.Area, Note: solution.Note,
-        ActionType:solution.ActionType,
+        ActionType:solution.actionType,
         Source:"官网"
         Source:"官网"
       };
       };
       if (needsolution.channelSolutionNo) {
       if (needsolution.channelSolutionNo) {
@@ -635,5 +635,32 @@ async foodRecordLogList(pobj) {
   return system.getResultSuccess(res);
   return system.getResultSuccess(res);
 }
 }
 
 
+// //推送ICP方案
+// async pushIcpSolution1(pushObj, solutionNo, appInfo, self) {
+//         //推送方案确认信息
+//         var confirmRes = await this.aliclient.reqbyget({ action: "ConfirmIntention", reqbody: { BizId: pushObj.IntentionBizId }, apiVersion: "2019-05-08" });
+//         console.log("confirmRes",confirmRes)
+//         // if (confirmRes && confirmRes.status == 0 && confirmRes.data) {
+//         //   var confirmResData = confirmRes.data;
+//         //   if (confirmResData.ConfirmUrl) {
+//         //     var reqObj3 = {
+//         //       actionType: "receiveIcpConfirmUrl",
+//         //       appInfo: appInfo,
+//         //       actionBody: {
+//         //         solutionNo: solutionNo,
+//         //         confirmUrl: confirmResData.ConfirmUrl
+//         //       }
+//         //     };
+//         //     var a = await self.reqCenterOrderApi(reqObj3);//保存用户确认方案url
+//         //   }
+//         // }
+//         // return confirmRes;
+// }
+
 }
 }
-module.exports = QcCenterOrderService;
+module.exports = QcCenterOrderService;
\ No newline at end of file
+
+// var a = new QcCenterOrderService();
+// a.pushIcpSolution1({
+//   IntentionBizId:"20201016103819000001",
+// })