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

8d07b5f0 · 宋毅 · 383263e3 · 8be567a5 · 8d07b5f0 · 8d07b5f0
Commit 8d07b5f0 authored Apr 16, 2021 by 宋毅
6 changed files
--- a/center-channel/app/base/api/impl/auth/accessAuth.js
+++ b/center-channel/app/base/api/impl/auth/accessAuth.js
@@ -112,9 +112,12 @@ class AccessAuthAPI extends WEBBase {
            case "logout"://用户退出--已经废弃，前端自己进行移除userpin信息
                opResult = await this.utilsAuthSve.userLogout(pobj, pobj.actionBody);
                break;
-            case "getAllChannels":
+            case "getAllChannels"://获取所有渠道（去重appid、app名字）
                opResult = await this.utilsAuthSve.getAllChannels(pobj);
                break;
+            case "getAllService"://获取所有渠道(信息更全一些)
+                opResult = await this.utilsAuthSve.getAllService(pobj);
+                break;
            default:
                opResult = system.getResult(null, "action_type参数错误");
                break;

--- a/center-channel/app/base/service/impl/common/ncSve.js
+++ b/center-channel/app/base/service/impl/common/ncSve.js
@@ -206,16 +206,7 @@ class NcService extends AppServiceBase {
    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('nc 关闭需求result-----',result)
-    if (result.status == 0) {
+    if (result && result.status == 0) {
-      if (result.data && result.data.orderNo) {
-          pobj.actionBody.orderNo = result.data.orderNo;
-          var orderrtn = await this.utilsOrderSve.delOrder(pobj, pobj.actionBody);
-          console.log("orderrtn   +++   +++  ++",orderrtn)
-          if (orderrtn.status < 0) {
-            return system.getResultFail(-5022, "订单关闭失败");
-          }
-      }
      //推送交付系统
      var reqParams = {
        actionBody: {

--- a/center-channel/app/base/service/impl/common/regCenterOrderSve.js
+++ b/center-channel/app/base/service/impl/common/regCenterOrderSve.js
@@ -352,18 +352,18 @@ class RegCenterOrderService extends AppServiceBase {
  //关闭reg订单
  async regOrderClose(pobj) {
-    var actionBody = pobj.actionBody;
+    // var actionBody = pobj.actionBody;
    var self = this;
    var url = settings.centerOrderUrl() + "action/regapi/springBoard";
    var rtn = await this.restPostUrl(pobj, url);
    if (rtn.status == 0 && rtn.data) {
      var channelOrderNo = pobj.actionBody.orderNo;
-      pobj.actionBody.orderNo = rtn.data.orderNo;
+      // pobj.actionBody.orderNo = rtn.data.orderNo;
-      pobj.actionType="delOrder";
+      // pobj.actionType="delOrder";
-      var orderrtn = await self.utilsOrderSve.delOrder(pobj, actionBody);
+      // var orderrtn = await self.utilsOrderSve.delOrder(pobj, actionBody);
-      if (orderrtn.status < 0) {
+      // if (orderrtn.status < 0) {
-        return system.getResultFail(-5022, "订单关闭失败");
+      //   return system.getResultFail(-5022, "订单关闭失败");
-      }
+      // }
      var tmpObj = {
        actionBody: {
          orderNo: rtn.data.orderNo,
@@ -506,23 +506,8 @@ class RegCenterOrderService extends AppServiceBase {
    var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('regNeedClose+++result', result)
-    var i;
-    var len; 
+    if (result && result.status == 0) {
-    if(result && result.data ){
-      len = result.data.length
-    }
-    var orders = []
-    if (result.status == 0) {
-      for(i=0;i<len;i++){
-        if (result.data && result.data[i].orderNo) {
-          orders.push(result.data[i].orderNo)
-          pobj.actionBody.orderNo = orders;
-          var orderrtn = await this.utilsOrderSve.delOrders(pobj, pobj.actionBody);
-          if (orderrtn.status < 0) {
-            return system.getResultFail(-5022, "订单关闭失败");
-          }
-        }
-      }
      //推送交付系统
      var reqParams = {
        actionBody: {

--- a/center-channel/app/base/service/impl/common/rtSve.js
+++ b/center-channel/app/base/service/impl/common/rtSve.js
@@ -209,16 +209,7 @@ class RtService extends AppServiceBase {
    var reqUrl = this.centerOrderUrl + "action/qcapi/springBoard";
    var result = await this.restPostUrl(pobj, reqUrl);
    console.log('rt 关闭需求result-----',result)
-    if (result.status == 0) {
+    if (result && result.status == 0) {
-      if (result.data && result.data.orderNo) {
-          pobj.actionBody.orderNo = result.data.orderNo;
-          var orderrtn = await this.utilsOrderSve.delOrder(pobj, pobj.actionBody);
-          console.log("orderrtn   +++   +++  ++",orderrtn)
-          if (orderrtn.status < 0) {
-            return system.getResultFail(-5022, "订单关闭失败");
-          }
-      }
      //推送交付系统
      var reqParams = {
        actionBody: {

--- a/center-channel/app/base/service/impl/utilsSve/utilsAuthSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsAuthSve.js
@@ -270,17 +270,17 @@ class UtilsAuthService extends AppServiceBase {
        //360验证接口
        let subData = "pin=" + pin + "&token=" + token;
        let url = settings.requestUrl360() + 'api/v1/VerifyPin';
-    let rtn = await this.restClient.execGet(subData,url);
+        let rtn = await this.restClient.execGet(subData, url);
        if (!rtn || !rtn.stdout) {
            return system.getResult(null, "restGet data is empty");
        }
        let checkRet = JSON.parse(rtn.stdout);
-    if(checkRet.code != 200){
+        if (checkRet.code != 200) {
-      return system.getResultFail(-1,checkRet.msg)
+            return system.getResultFail(-1, checkRet.msg)
        }
        //---渠道用户登录，有则返回userpin ，没有则注册用户并返回userpin
        actionBody.channelUserId = pin;
-    opResult = await this.getLoginByUserName(req,pobj, actionBody);
+        opResult = await this.getLoginByUserName(req, pobj, actionBody);
        return opResult;
    }
@@ -294,12 +294,22 @@ class UtilsAuthService extends AppServiceBase {
    }
    /**
-   * 获取所有渠道
+     * 获取所有渠道（去重appid、app名字）
     * @returns {Promise<void>}
     */
-  async getAllChannels(pobj){
+    async getAllChannels(pobj) {
-    let url= this.centerAppUrl + 'auth/accessAuth/getAllChannels';
+        let url = this.centerAppUrl + 'auth/accessAuth/getAllChannels';
-    let result = await this.restPostUrl(pobj,url);
+        let result = await this.restPostUrl(pobj, url);
+        return result
+    }
+    /**
+     * 获取所有渠道(信息更全一些)
+     * @returns {Promise<void>}
+     */
+    async getAllService(pobj) {
+        let url = this.centerAppUrl + 'auth/accessAuth/getAllService';
+        let result = await this.restPostUrl(pobj, url);
        return result
    }

--- a/center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
+++ b/center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
@@ -413,14 +413,6 @@ class UtilsNeedService extends AppServiceBase {
    // 明天找栋源确认 如果需要增加 在这个文件搜索updateChanceStatus
    // 2020 1016 lin 新增 需求关闭时判断 方案状态 订单状态，打个比方如果已经生成订单了 那么肯定不能直接关闭需求
    if (result.status == 0) {
-      if (result.data) {
-        pobj.actionBody.orderNo = result.data;
-        var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
-        if (orderrtn.status < 0) {
-          return system.getResultFail(-5022, "订单关闭失败");
-        }
-      }
      //推送交付系统
      var reqParams = {
        actionBody: {