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

0c42f096 · 王勇飞 · 2b793d48 · 65e916df · 0c42f096 · 0c42f096
Commit 0c42f096 authored Aug 06, 2020 by 王勇飞
6 changed files
--- a/fqboss/app/base/controller/impl/orderCtl.js
+++ b/fqboss/app/base/controller/impl/orderCtl.js
@@ -623,7 +623,8 @@ class orderCtl extends CtlBase {
        if (order && order.channelCode) {
          var judgeRes = this.trademarkSve.dao.judgeChannelCode(order.channelCode);
          if(judgeRes){
-            if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan"){
+            // 2020 lin 新增 gsbweb渠道 作为工商h5用
+            if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan" || order.channelCode=="gsbweb"){
              await this.channelreceiveSve.pushChannelAssistTmData(order.orderNum, order.channelCode,channelorder.data);//推送数据
            }else{
              await this.service.pushChannelAssistTmData(order.orderNum, order.channelCode);//推送数据
@@ -708,7 +709,8 @@ class orderCtl extends CtlBase {
          if (order && order.channelCode) {
            var judgeRes = this.trademarkSve.dao.judgeChannelCode(order.channelCode);
            if(judgeRes){
-              if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan"){
+                // 2020 lin 新增 gsbweb渠道 作为工商h5用
+              if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan" || order.channelCode=="gsbweb"){
                await this.channelreceiveSve.pushEditChannelAssistTmData(order.orderNum, order.channelCode,channelorder.data);//推送修改数据
              }else{
                await this.service.pushEditChannelAssistTmData(order.orderNum, order.channelCode);//推送修改数据

--- a/fqboss/app/base/controller/impl/trademarkCtl.js
+++ b/fqboss/app/base/controller/impl/trademarkCtl.js
@@ -169,7 +169,7 @@ class TrademarkCtl extends CtlBase {
      }//阿里的商标，则直接推送到阿里---状态：已提交阿里(待支付)
      // if (item.tmSourceType == "64") {
      if (judgeRes) {
-        if(item.tmSourceType=="1024" || item.tmSourceType=="2048" || item.tmSourceType=="4096" ){//center-channel
+        if(item.tmSourceType=="1024" || item.tmSourceType=="2048" || item.tmSourceType=="4096" || item.tmSourceType=="8192"){//center-channel
          var pushObj={
            orderNo:item.channelOrderNum,
            tbCode:item.proxyCode,

--- a/fqboss/app/base/db/metadata/apps/platform.js
+++ b/fqboss/app/base/db/metadata/apps/platform.js
@@ -2066,9 +2066,9 @@ module.exports = {
            "order_source_type": { 1: "PC", 2: "移动商城", 4: "渠道方", 8: "beehive渠道", 16: "阿里云" },
            "payType": { "wx": "微信", "zfb": "支付宝", "yh": "银行卡" },
            "payResult": { "Fail": "失败", "Success": "成功" },
-            "tmSourceType": { 1: "PC", 2: "移动端", 4: "渠道", 8: "beehive", 16: "gsb", 32: "阿里云",64:"1688",128:"jd",256:"gsbhome",512:"bw",1024:"gsbh5",2048:"youke",4096:"zhongchuan" },
+            "tmSourceType": { 1: "PC", 2: "移动端", 4: "渠道", 8: "beehive", 16: "gsb", 32: "阿里云",64:"1688",128:"jd",256:"gsbhome",512:"bw",1024:"gsbh5",2048:"youke",4096:"zhongchuan",8192:"gsbweb" },
-            "tmSourceTypeToChannelCode":{"64":"1688","128":"jd","256":"gsbhome","512":"bw","1024":"gsbh5","2048":"youke","4096":"zhongchuan"},//商标来源对应渠道码
+            "tmSourceTypeToChannelCode":{"64":"1688","128":"jd","256":"gsbhome","512":"bw","1024":"gsbh5","2048":"youke","4096":"zhongchuan","8192":"gsbweb"},//商标来源对应渠道码
-            "channelCodeToTmSourceType":{"1688":"64","jd":"128","gsbhome":"256","bw":"512","gsbh5":"1024","youke":"2048","zhongchuan":"4096"},//渠道码对应商标来源
+            "channelCodeToTmSourceType":{"1688":"64","jd":"128","gsbhome":"256","bw":"512","gsbh5":"1024","youke":"2048","zhongchuan":"4096","gsbweb":"8192"},//渠道码对应商标来源
            "user_show_order_status": { 1: "显示", 2: "用户删除", 4: "系统过期删除" },
            "order_status": { "1": "未付款", "2": "订单取消", "4": "付款成功", "8": "退款处理中", "16": "已退款", "32": "已提报", "64": "审核中" },
            "msg_notice_type": { "friend": "朋友", "boss": "老板" },

--- a/fqboss/app/base/service/impl/tmflowSve.js
+++ b/fqboss/app/base/service/impl/tmflowSve.js
@@ -258,7 +258,7 @@ class TmFlowService extends ServiceBase {
            officialFileName:fileName + "_" + tm.tmName + "_" + tm.nclOneCodes + "." + fileType,
            officialFileUrl:objItem.url,
          };
-          if(tm.tmSourceType=="1024" || tm.tmSourceType=="2048" || tm.tmSourceType=="4096"){//center-channel
+          if(tm.tmSourceType=="1024" || tm.tmSourceType=="2048" || tm.tmSourceType=="4096" || tm.tmSourceType=="8192"){//center-channel
            var channelPushObj={
              orderNo:tm.channelOrderNum,
              tbCode:tm.proxyCode,

--- a/fqboss/app/base/service/impl/trademarkSve.js
+++ b/fqboss/app/base/service/impl/trademarkSve.js
@@ -184,7 +184,7 @@ class TrademarkService extends ServiceBase {
      + "c.`mobile`,c.`fax`,c.`zipCode`,b.`businessLicensePic`,b.`identityCard`,b.`identityCardPic`,a.`tmFormType`,a.`voiceUrl`,a.`tmName`,a.`nclOneCodes`,a.`nclSmallCodes`,"
      + "a.`picUrl`,a.`colorizedPicUrl`,a.`descUrl` "
      + " FROM `h_trade_mark` AS a,`h_tmapplier_info` AS b,`h_tmcustomer_info` AS c "
-      + " WHERE a.`orderNum`=b.`orderNum` AND a.`orderNum`=c.`orderNum` and a.tmSourceType IN ('16', '64', '128', '256','512','1024','2048','4096') "
+      + " WHERE a.`orderNum`=b.`orderNum` AND a.`orderNum`=c.`orderNum` and a.tmSourceType IN ('16', '64', '128', '256','512','1024','2048','4096','8192') "
      + " AND a.`deleted_at` IS NULL AND a.`tmStatus` = 'WAITCOMMIT' ORDER BY a.id ASC LIMIT " + pageSize + " OFFSET " + from;
    var tmpdbResult = await this.dao.customQuery(sql);
@@ -523,7 +523,7 @@ class TrademarkService extends ServiceBase {
                } else {
                  pushObj["opNotes"] = "已提交";
                }
-                if (tm.tmSourceType == "1024" || tm.tmSourceType == "2048" || tm.tmSourceType == "4096") {//center-channel
+                if (tm.tmSourceType == "1024" || tm.tmSourceType == "2048" || tm.tmSourceType == "4096" || tm.tmSourceType == "8192") {//center-channel
                  var channelPushObj = {
                    orderNo: tm.channelOrderNum,
                    tbCode: keyCode,
@@ -618,7 +618,7 @@ class TrademarkService extends ServiceBase {
                  channelOrderNum: tm.channelOrderNum,
                  tmRegistNum: code
                }
-                if (tm.tmSourceType == "1024" || tm.tmSourceType == "2048" || tm.tmSourceType == "4096") {//center-channel
+                if (tm.tmSourceType == "1024" || tm.tmSourceType == "2048" || tm.tmSourceType == "4096" || tm.tmSourceType == "8192") {//center-channel
                  var channelPushObj = {
                    orderNo: tm.channelOrderNum,
                    tbCode: proxyCode,

--- a/fqboss/app/config/settings.js
+++ b/fqboss/app/config/settings.js
@@ -48,7 +48,7 @@ var settings = {
      if (channelCode == "jd") {
        return "https://tm.plus.jdcloud.com";//"http://gsbapi.plus.jdcloud.com";
      }
-      if (channelCode == "gsbh5" || channelCode == "youke" || channelCode=="zhongchuan") {
+      if (channelCode == "gsbh5" || channelCode == "youke" || channelCode=="zhongchuan" || channelCode=="gsbweb") {
        return "http://center-order-service";
      }
      if (channelCode == "AliTm") {