Commit 2d13d7aa by 庄冰

zhongchuan

parent bf255d10
......@@ -623,7 +623,7 @@ 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"){
if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan"){
await this.channelreceiveSve.pushChannelAssistTmData(order.orderNum, order.channelCode,channelorder.data);//推送数据
}else{
await this.service.pushChannelAssistTmData(order.orderNum, order.channelCode);//推送数据
......@@ -708,7 +708,7 @@ 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"){
if(order.channelCode=="gsbh5" || order.channelCode=="youke" || order.channelCode=="zhongchuan"){
await this.channelreceiveSve.pushEditChannelAssistTmData(order.orderNum, order.channelCode,channelorder.data);//推送修改数据
}else{
await this.service.pushEditChannelAssistTmData(order.orderNum, order.channelCode);//推送修改数据
......
......@@ -169,7 +169,7 @@ class TrademarkCtl extends CtlBase {
}//阿里的商标,则直接推送到阿里---状态:已提交阿里(待支付)
// if (item.tmSourceType == "64") {
if (judgeRes) {
if(item.tmSourceType=="1024" || item.tmSourceType=="2048" ){//center-channel
if(item.tmSourceType=="1024" || item.tmSourceType=="2048" || item.tmSourceType=="4096" ){//center-channel
var pushObj={
orderNo:item.channelOrderNum,
tbCode:item.proxyCode,
......
......@@ -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" },
"tmSourceTypeToChannelCode":{"64":"1688","128":"jd","256":"gsbhome","512":"bw","1024":"gsbh5","2048":"youke"},//商标来源对应渠道码
"channelCodeToTmSourceType":{"1688":"64","jd":"128","gsbhome":"256","bw":"512","gsbh5":"1024","youke":"2048"},//渠道码对应商标来源
"tmSourceType": { 1: "PC", 2: "移动端", 4: "渠道", 8: "beehive", 16: "gsb", 32: "阿里云",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"},//商标来源对应渠道码
"channelCodeToTmSourceType":{"1688":"64","jd":"128","gsbhome":"256","bw":"512","gsbh5":"1024","youke":"2048","zhongchuan":"4096"},//渠道码对应商标来源
"user_show_order_status": { 1: "显示", 2: "用户删除", 4: "系统过期删除" },
"order_status": { "1": "未付款", "2": "订单取消", "4": "付款成功", "8": "退款处理中", "16": "已退款", "32": "已提报", "64": "审核中" },
"msg_notice_type": { "friend": "朋友", "boss": "老板" },
......
......@@ -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" ){//center-channel
if(tm.tmSourceType=="1024" || tm.tmSourceType=="2048" || tm.tmSourceType=="4096"){//center-channel
var channelPushObj={
orderNo:tm.channelOrderNum,
tbCode:tm.proxyCode,
......
......@@ -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") {
if (channelCode == "gsbh5" || channelCode == "youke" || channelCode=="zhongchuan") {
return "http://center-order-service";
}
if (channelCode == "AliTm") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment