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

center-channel/app/base/api/api.base.js

@@ -12,7 +12,7 @@ class APIBase {
         this.toolSve = system.getObject("service.trademark.toolSve");
         this.toolSve = system.getObject("service.trademark.toolSve");
         this.exTime = 6 * 3600;//缓存过期时间，6小时
         this.exTime = 6 * 3600;//缓存过期时间，6小时
         this.cacheMethodList = [
         this.cacheMethodList = [
-
+            "icpNotify"
         ];
         ];
     }
     }
     getUUID() {
     getUUID() {

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

@@ -291,7 +291,7 @@ class CenterorderService extends AppServiceBase {
     }
     }
     var deliveryObj = {
     var deliveryObj = {
       actionBody: {
       actionBody: {
-        orderNo: pobj.actionBody.channelOrder.channelOrderNo,
+        orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
         needsolution: solutiondata.data.solutionContent,
         needsolution: solutiondata.data.solutionContent,
         skuCode:data.data.payCode,
         skuCode:data.data.payCode,
         servicer:{
         servicer:{

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

@@ -53,7 +53,7 @@ class QcCenterOrderService extends AppServiceBase {
       }
       }
       var self = this;
       var self = this;
       //推送方案
       //推送方案
-      // this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
+      this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
       return system.getResultSuccess();
       return system.getResultSuccess();
     }
     }
     return res;
     return res;
@@ -96,7 +96,7 @@ class QcCenterOrderService extends AppServiceBase {
         BizId: ab.BizId, Note: ab.Note
         BizId: ab.BizId, Note: ab.Note
       };
       };
       //关闭方案
       //关闭方案
-      // this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }
     }
     return res;
     return res;
@@ -132,7 +132,7 @@ class QcCenterOrderService extends AppServiceBase {
       };
       };
       var self = this;
       var self = this;
       //推送方案材料
       //推送方案材料
-      // self.aliclient.reqbyget({action:"SavePartnerSubmitMaterial",reqbody:pushObj,apiVersion:"2019-05-08"});
+      self.aliclient.reqbyget({action:"SavePartnerSubmitMaterial",reqbody:pushObj,apiVersion:"2019-05-08"});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }
     }
     return res;
     return res;
@@ -148,7 +148,7 @@ class QcCenterOrderService extends AppServiceBase {
         ApplicationStatus:res.data.ApplicationStatus
         ApplicationStatus:res.data.ApplicationStatus
       };
       };
       //推送状态变更
       //推送状态变更
-      // this.aliclient.reqbyget({action:"AcceptPartnerNotification",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({action:"AcceptPartnerNotification",reqbody:pushObj,apiVersion:"2019-05-08"});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }
     }
     return res;
     return res;
@@ -164,7 +164,7 @@ class QcCenterOrderService extends AppServiceBase {
         BizId: needsolution.channelSolutionNo, Note: ab.note
         BizId: needsolution.channelSolutionNo, Note: ab.note
       };
       };
       //关闭方案
       //关闭方案
-      // this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }
     }
     return res;
     return res;

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

@@ -2,6 +2,7 @@ var system = require("../../../system");
 var settings = require("../../../../config/settings");
 var settings = require("../../../../config/settings");
 const AppServiceBase = require("../../app.base");
 const AppServiceBase = require("../../app.base");
 const fs = require("fs");
 const fs = require("fs");
+const { json } = require("sequelize");
 //需求操作类
 //需求操作类
 class UtilsNeedService extends AppServiceBase {
 class UtilsNeedService extends AppServiceBase {
   constructor() {
   constructor() {
@@ -65,6 +66,13 @@ class UtilsNeedService extends AppServiceBase {
       var url = this.centerOrderUrl + reqUrl;
       var url = this.centerOrderUrl + reqUrl;
     }
     }
     pobj.actionType = "receiveIcpFeedback";
     pobj.actionType = "receiveIcpFeedback";
+    // 2020 0803 lin 修改;
+    if(pobj.intentionStatus) {
+        // 如果需求当前字段为5（已关闭）则通知fq
+        if(pobj.intentionStatus == 5) {
+            self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
+        }
+    }
     var rtn = await this.execClient.execPost(pobj, url);
     var rtn = await this.execClient.execPost(pobj, url);
     var data = JSON.parse(rtn.stdout);
     var data = JSON.parse(rtn.stdout);
     return data;
     return data;
@@ -302,6 +310,14 @@ class UtilsNeedService extends AppServiceBase {
     try {
     try {
       var tmpFileName = docUrl.substring(0, docUrl.lastIndexOf("?"));
       var tmpFileName = docUrl.substring(0, docUrl.lastIndexOf("?"));
       var fileName = tmpFileName.substr(tmpFileName.lastIndexOf("/") + 1, tmpFileName.lenght);
       var fileName = tmpFileName.substr(tmpFileName.lastIndexOf("/") + 1, tmpFileName.lenght);
+      // 2020 0803 lin 修改;
+      var urlJson = this.urlSplit(docUrl);
+      if(urlJson["Expires"]){
+        // url中过期时间与服务器时间对比结果为已过期
+        if(urlJson["Expires"] < new Date().getTime()) {
+          return "http://gsb-zc.oss-cn-beijing.aliyuncs.com/"+fileName;
+        }
+      }
       //解码后的文件全名:xxx.pdf
       //解码后的文件全名:xxx.pdf
       var fileAllName = decodeURIComponent(fileName);//为xxx.pdf
       var fileAllName = decodeURIComponent(fileName);//为xxx.pdf
       var saveFilePath = '/tmp/' + fileAllName;
       var saveFilePath = '/tmp/' + fileAllName;
@@ -389,6 +405,16 @@ class UtilsNeedService extends AppServiceBase {
     return res;
     return res;
   }
   }
 
 
+
+  urlSplit(url) {
+    var arr=url.split("?")[1];           //根据？跟个url
+    var arr2=arr[1].split("&");         //根据&重新分割参数
+    var jsonarr={};                    //定义一个json对象放置url  参数
+    for(var i=0;i<arr2.length;i++){   //循环将参数放到json里面
+      jsonarr[arr2[i].substring(0,1)]=arr2[i].substring(2,3);
+    }
+    return jsonarr;
+  }
   // async test1() {
   // async test1() {
 
 
   //   var a = await this.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: "20200416125415000001", Note: "测试需求关闭" }, apiVersion: "2019-05-08" });
   //   var a = await this.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: "20200416125415000001", Note: "测试需求关闭" }, apiVersion: "2019-05-08" });