Skip to content

Z
zhichan
Commit 6bdb1878 by 宋毅
Options

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

parents 6fe1cfff 0fc48989
Showing with 31 additions and 11 deletions
center-channel/app/base/api/impl/icp/consultation.js
...@@ -266,8 +266,13 @@ class Consultation extends APIBase { ...@@ -266,8 +266,13 @@ class Consultation extends APIBase {
case "HAINAN": case "HAINAN":
pobj.area = "海南"; pobj.area = "海南";
break; break;
case "GUANGZHOU":
pobj.area = "广州";
break;
case "SHENZHEN":
pobj.area = "深圳";
break;
default: default:
pobj.area = "";
break; break;
} }
} }
......
center-channel/app/base/api/impl/icp/order.js
...@@ -172,7 +172,6 @@ class Order extends APIBase { ...@@ -172,7 +172,6 @@ class Order extends APIBase {
pobj.area = "34"; pobj.area = "34";
break; break;
default: default:
pobj.area = "";
break; break;
} }
} }
......
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
...@@ -49,7 +49,9 @@ const cityLetter = { ...@@ -49,7 +49,9 @@ const cityLetter = {
"内蒙古":"NEIMENGGU", "内蒙古":"NEIMENGGU",
"西藏":"XIZANG", "西藏":"XIZANG",
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN" "海南":"HAINAN",
"广州":"GUANGZHOU",
"深圳":"SHENZHEN"
} }
//baidu pinyinzhuanyong 2020-11-6 //baidu pinyinzhuanyong 2020-11-6
......
center-channel/app/base/service/impl/common/centerorderSve.js
...@@ -629,6 +629,12 @@ class CenterorderService extends AppServiceBase { ...@@ -629,6 +629,12 @@ class CenterorderService extends AppServiceBase {
} else if (pobj.actionBody.channelItemCode == '7') { } else if (pobj.actionBody.channelItemCode == '7') {
pobj.actionBody.regType = "baidu.edi"; pobj.actionBody.regType = "baidu.edi";
} }
else if (pobj.actionBody.channelItemCode == 'NC') {
pobj.actionBody.regType = "baidu.wangwen";
}
else if (pobj.actionBody.channelItemCode == 'RT') {
pobj.actionBody.regType = "baidu.radiotv";
}
var fqobj = { var fqobj = {
actionBody: { actionBody: {
area: pobj.actionBody.province, area: pobj.actionBody.province,
......
center-channel/app/base/service/impl/common/ncSve.js
...@@ -41,7 +41,9 @@ const cityLetter = { ...@@ -41,7 +41,9 @@ const cityLetter = {
"内蒙古":"NEIMENGGU", "内蒙古":"NEIMENGGU",
"西藏":"XIZANG", "西藏":"XIZANG",
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN" "海南":"HAINAN",
"广州":"GUANGZHOU",
"深圳":"SHENZHEN"
} }
//百度拼音转义 2020-11-11 laolan //百度拼音转义 2020-11-11 laolan
......
center-channel/app/base/service/impl/common/rtSve.js
...@@ -40,7 +40,9 @@ const cityLetter = { ...@@ -40,7 +40,9 @@ const cityLetter = {
"内蒙古":"NEIMENGGU", "内蒙古":"NEIMENGGU",
"西藏":"XIZANG", "西藏":"XIZANG",
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN" "海南":"HAINAN",
"广州":"GUANGZHOU",
"深圳":"SHENZHEN"
} }
//百度拼音转义 2020-11-11 laolan //百度拼音转义 2020-11-11 laolan
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -1322,9 +1322,9 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1322,9 +1322,9 @@ class UtilsNeedService extends AppServiceBase {
* @param {*} actionBody * @param {*} actionBody
*/ */
async submitNeed2(pobj, actionBody) { async submitNeed2(pobj, actionBody) {
if (actionBody.type == "esp.wangwen" || actionBody.type == "esp.food") { // if (actionBody.type == "esp.wangwen" || actionBody.type == "esp.food") {
actionBody.area = this.wangwenAreaChange(actionBody.area) // actionBody.area = this.wangwenAreaChange(actionBody.area)
} // }
if (!actionBody.intentionBizId) { if (!actionBody.intentionBizId) {
return system.getResult(null, "actionBody.intentionBizId can not be empty，100380"); return system.getResult(null, "actionBody.intentionBizId can not be empty，100380");
} }
...@@ -1348,8 +1348,10 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1348,8 +1348,10 @@ class UtilsNeedService extends AppServiceBase {
pobj.actionBody.type = "baidu.icp"; pobj.actionBody.type = "baidu.icp";
} else if (pobj.actionBody.channel_type_code == 7) { } else if (pobj.actionBody.channel_type_code == 7) {
pobj.actionBody.type = "baidu.edi"; pobj.actionBody.type = "baidu.edi";
} else if (pobj.actionBody.channel_type_code == "tmjy") { } else if (pobj.actionBody.channel_type_code == "NC") {
pobj.actionBody.type = "baidu.tmd"; pobj.actionBody.type = "baidu.wangwen";
} else if (pobj.actionBody.channel_type_code == "RT") {
pobj.actionBody.type = "baidu.radiotv";
} }
if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) { if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
pobj.actionBody.level = "A"; pobj.actionBody.level = "A";
......
center-channel/app/base/utils/dingClient.js
...@@ -6,14 +6,16 @@ class dingClient { ...@@ -6,14 +6,16 @@ class dingClient {
} }
//推送峰擎异常提醒 //推送峰擎异常提醒
async gatewayPushError(err) { async gatewayPushError(err) {
if (process.env.APP_ENV === "prod") {
let c = `注意提醒：阿里->推送峰擎异常，老板们加油，加油，加油 ！！！${JSON.stringify(err)}` let c = `注意提醒：阿里->推送峰擎异常，老板们加油，加油，加油 ！！！${JSON.stringify(err)}`
let t = new Date().toLocaleString() let t = new Date().toLocaleString()
this.execClient.execPost({ this.execClient.execPost({
"msgtype": "text", "msgtype": "text",
"text": {"content": t + c} "text": {"content": t + c}
}, this.gatewayurl).catch(alierr=>{ }, this.gatewayurl).catch(alierr => {
console.log(alierr) console.log(alierr)
}); });
} }
}
} }
module.exports = dingClient; module.exports = dingClient;
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