Merge branch 'fqboss' of gitlab.gongsibao.com:jiangyong/zhichan into fqboss

fqboss/app/base/db/impl/channelreceiveDao.js

@@ -54,8 +54,9 @@ class ChannelReceiveDao {
   //推送辅助、担保商标注册数据
   async pushChannelAssistTmData(obj){
     try {
+      var channelCode=obj.channelCode || "gsbh5";
       var channelApiUrl = this.channelApiUrl;
-      channelApiUrl = settings.channelApiUrl("gsbh5");
+      channelApiUrl = settings.channelApiUrl(channelCode);
       var reqUrl = channelApiUrl + "/notifyaction/internalCallsNotify/nbtzreceiveAssistTmData";
       var rc = system.getObject("util.execClient");
       var rtn = await rc.execPost(obj, reqUrl);
@@ -66,7 +67,7 @@ class ChannelReceiveDao {
       if (rtn.status == 0) {
         await this.oplogSve.createDb({
           logLevel: "info",
-          optitle: "gsbh5辅助、担保商标注册数据推送---成功",
+          optitle: channelCode+"辅助、担保商标注册数据推送---成功",
           op: reqUrl,
           content: JSON.stringify(obj),
           resultinfo: JSON.stringify(rtn),
@@ -75,7 +76,7 @@ class ChannelReceiveDao {
       } else {
         await this.oplogSve.createDb({
           logLevel: "error",
-          optitle: "gsbh5辅助、担保商标注册数据推送---失败",
+          optitle: channelCode+"辅助、担保商标注册数据推送---失败",
           op: reqUrl,
           content: JSON.stringify(obj),
           resultinfo: JSON.stringify(rtn),
@@ -88,7 +89,7 @@ class ChannelReceiveDao {
       console.log(e.stack);
       await this.oplogSve.createDb({
         logLevel: "error",
-        optitle: "gsbh5辅助、担保商标注册数据推送---异常",
+        optitle: obj.channelCode+"辅助、担保商标注册数据推送---异常",
         op: "app/base/db/impl/channelreceiveDao.js",
         content: JSON.stringify(obj),
         resultinfo: JSON.stringify(e.stack),
@@ -100,8 +101,9 @@ class ChannelReceiveDao {
   //推送辅助、担保商标注册修改数据
   async pushEditChannelAssistTmData(obj){
     try {
+      var channelCode=obj.channelCode || "gsbh5";
       var channelApiUrl = this.channelApiUrl;
-      channelApiUrl = settings.channelApiUrl("gsbh5");
+      channelApiUrl = settings.channelApiUrl(channelCode);
       var reqUrl = channelApiUrl + "/notifyaction/internalCallsNotify/nbtzreceiveEditAssistTmData";
       var rc = system.getObject("util.execClient");
       var rtn = await rc.execPost(obj, reqUrl);
@@ -112,7 +114,7 @@ class ChannelReceiveDao {
       if (rtn.status == 0) {
         await this.oplogSve.createDb({
           logLevel: "info",
-          optitle: "gsbh5辅助、担保商标注册修改数据推送---成功",
+          optitle: channelCode+"辅助、担保商标注册修改数据推送---成功",
           op: reqUrl,
           content: JSON.stringify(obj),
           result: JSON.stringify(rtn),
@@ -121,7 +123,7 @@ class ChannelReceiveDao {
       } else {
         await this.oplogSve.createDb({
           logLevel: "error",
-          optitle: "gsbh5辅助、担保商标注册修改数据推送---失败",
+          optitle: channelCode+"辅助、担保商标注册修改数据推送---失败",
           op: reqUrl,
           content: JSON.stringify(obj),
           result: JSON.stringify(rtn),
@@ -134,7 +136,7 @@ class ChannelReceiveDao {
       console.log(e.stack);
       await this.oplogSve.createDb({
         logLevel: "error",
-        optitle: "gsbh5辅助、担保商标注册修改数据推送---异常",
+        optitle: obj.channelCode+"辅助、担保商标注册修改数据推送---异常",
         op: "app/base/db/impl/channelreceiveDao.js",
         content: JSON.stringify(e.stack),
         clientIp: ""