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

center-channel/app/base/api/impl/action/opNeed.js

@@ -15,9 +15,9 @@ class OpNeed extends APIBase {
       * action_body     执行的参数
       * action_body     执行的参数
       */
       */
     async springBoard(pobj, qobj, req) {
     async springBoard(pobj, qobj, req) {
-        if (!pobj.actionProcess) {
-            return system.getResult(null, "actionProcess参数不能为空");
-        }
+        // if (!pobj.actionProcess) {
+        //     return system.getResult(null, "actionProcess参数不能为空");
+        // }
         if (!pobj.actionType) {
         if (!pobj.actionType) {
             return system.getResult(null, "actionType参数不能为空");
             return system.getResult(null, "actionType参数不能为空");
         }
         }

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

@@ -534,7 +534,10 @@ class UtilsNeedService extends AppServiceBase {
         this.utilsPushSve.business2Channel(tmpObj, "pushDeliveryStatusNotify");
         this.utilsPushSve.business2Channel(tmpObj, "pushDeliveryStatusNotify");
         pobj.actionBody.orderNo = rtn.data.orderNo;
         pobj.actionBody.orderNo = rtn.data.orderNo;
         if (actionBody.status == 11) {
         if (actionBody.status == 11) {
+          pobj.actionType = "delOrder";
           var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
           var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
+          console.log('状态更新---icpNotify---orderrtn---',JSON.stringify(orderrtn))
+          this.execClientNew.execLogs("api-center-channel-delOrder:", pobj, "center-channel-delOrder", orderrtn, null);
           if (orderrtn.status < 0) {
           if (orderrtn.status < 0) {
             return system.getResultFail(-5022, "订单关闭失败");
             return system.getResultFail(-5022, "订单关闭失败");
           }
           }

center-channel/app/config/routes/api.js

@@ -243,7 +243,7 @@ module.exports = function (app) {
             return;
             return;
         }
         }
         // 2020 0812 lin 只去掉了check，因为要记录智能诊断的返回值，其他接口暂时未去掉
         // 2020 0812 lin 只去掉了check，因为要记录智能诊断的返回值，其他接口暂时未去掉
-        if (["getAppTokenByHosts", "getAppTokenByAppKey", "test", "getIndustries", "getSecondIndustries", "getQualificationByIndustry", "counselling", "queryTradeProduceList"].indexOf(req.body.actionType) >= 0) {
+        if (["getAppTokenByHosts", "getAppTokenByAppKey", "test", "getIndustries", "getSecondIndustries", "getQualificationByIndustry", "counselling", "queryTradeProduceList","getNeedComparisonList"].indexOf(req.body.actionType) >= 0) {
             req.body.actionBody.appHosts = req.host;
             req.body.actionBody.appHosts = req.host;
             next();
             next();
             return;
             return;