icp

d9b8ff70 · 庄冰 · 87808f48 · d9b8ff70 · d9b8ff70 · d9b8ff70
Commit d9b8ff70 authored Jul 29, 2020 by 庄冰
Showing with 28 additions and 13 deletions

center-channel/app/base/api/api.base.js
+15 -0

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

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

No files found.
--- a/center-channel/app/base/api/api.base.js
+++ b/center-channel/app/base/api/api.base.js
 const system = require("../system");
 const settings = require("../../config/settings");
 const uuidv4 = require('uuid/v4');
+const sha256 = require('sha256');
 const md5 = require("MD5");
 class APIBase {
    constructor() {
        this.restClient = system.getObject("util.restClient");
+        this.redisClient = system.getObject("util.redisClient");
        this.cacheManager = system.getObject("db.common.cacheManager");
        this.logCtl = system.getObject("service.common.oplogSve");
        this.toolSve = system.getObject("service.trademark.toolSve");
        this.exTime = 6 * 3600;//缓存过期时间，6小时
+        this.cacheMethodList = [
+        ];
    }
    getUUID() {
        var uuid = uuidv4();
@@ -20,6 +25,12 @@ class APIBase {
    async doexecMethod(gname, methodname, pobj, query, req) {
        req.requestId = this.getUUID();
        try {
+            var shaStr = await sha256(JSON.stringify(pobj));
+            //查询缓存
+            var cacheRes = await this.redisClient.get(shaStr);
+            if (cacheRes) {
+                return JSON.parse(cacheRes);
+            }
            var rtn = await this[methodname](pobj, query, req);
            this.logCtl.createDb({
                appid: req.app.id,
@@ -33,6 +44,10 @@ class APIBase {
                opTitle: "api服务提供方appKey:" + settings.appKey,
            });
            rtn.requestId = req.requestId;
+            if(this.cacheMethodList.indexOf(methodname)>=0 && rtn.status && rtn.status==0){
+                //保存缓存
+                await this.redisClient.setWithEx(shaStr, JSON.stringify(rtn), 3600);
+            }
            return rtn;
        } catch (e) {
            console.log(e.stack, "api调用出现异常，请联系管理员..........")

--- a/center-channel/app/base/service/impl/common/centerorderSve.js
+++ b/center-channel/app/base/service/impl/common/centerorderSve.js
@@ -206,12 +206,12 @@ class CenterorderService extends AppServiceBase {
  async pushIcpOrderDelivery2Qfb(orderNo,needsolution){
    var pushObj = {
      orderNo:orderNo,
-      needsolution:needsolution
+      needsolution:needsolution.solutionContent
    };
    var url = this.qifubaoUrl + "xxx/xxxxx";
    var rtn = await this.execClient.execPost(pushObj, url);
    var data = JSON.parse(rtn.stdout);
-    return system.getResultSuccess();
+    return system.getResultSuccess(data);
  }
  async icppaysuccess(pobj) {
@@ -283,7 +283,7 @@ class CenterorderService extends AppServiceBase {
  }
  //--------------------------阿里IC---end--------------------------------------------------------
-  //--------------------------阿里ICP---start--------------------------------------------------------
+  //--------------------------阿里ICP---start------无效已迁移至qcCenterOrderSve.js--------------------------------------------------
  //提交公司注册方案
  async submitIcpProgramme(pobj) {
    var res = await this.reqCenterOrderApi(pobj, "action/icpapi/springBoard");

--- a/center-channel/app/base/service/impl/common/qcCenterOrderSve.js
+++ b/center-channel/app/base/service/impl/common/qcCenterOrderSve.js
@@ -3,7 +3,7 @@ const crypto = require('crypto');
 var settings = require("../../../../config/settings");
 const AppServiceBase = require("../../app.base");
 /**
- * 资质信息提报相关接口
+ * 资质信息提报相关接口(ICP\EDI)
 */
 class QcCenterOrderService extends AppServiceBase {
  constructor() {
@@ -50,7 +50,7 @@ class QcCenterOrderService extends AppServiceBase {
      };
      var self = this;
      //推送方案
-      // this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
+      this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
      return system.getResultSuccess();
    }
    return res;
@@ -145,13 +145,13 @@ class QcCenterOrderService extends AppServiceBase {
        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 res;
  }
-  //icp材料提交
+  //交付材料提交
  async serviceProviderSubmitMaterial(pobj) {
    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
@@ -181,12 +181,12 @@ class QcCenterOrderService extends AppServiceBase {
      };
      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 res;
  }
-  //icp通知状态变更
+  //通知交付状态变更
  async serviceProviderNotification(pobj) {
    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
@@ -196,13 +196,13 @@ class QcCenterOrderService extends AppServiceBase {
        OfficialFileURL:res.data.OfficialFileURL,
        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 res;
  }
-  //服务商icp方案关闭
+  //交付单关闭
  async closeOrderDelivery(pobj) {
    var res = await this.reqCenterOrderApi(pobj, "action/qcapi/springBoard");
    if (res && res.status == 0 && res.data) {
@@ -213,7 +213,7 @@ class QcCenterOrderService extends AppServiceBase {
        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 res;