Skip to content

Z
zhichan
Commit 71fc8c17 by 宋毅
Options

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

parents af6e4d07 9952a238
Showing with 31 additions and 18 deletions
center-channel/app/base/api/impl/icp/consultation.js
...@@ -272,6 +272,9 @@ class Consultation extends APIBase { ...@@ -272,6 +272,9 @@ class Consultation extends APIBase {
case "SHENZHEN": case "SHENZHEN":
pobj.area = "深圳"; pobj.area = "深圳";
break; break;
case "QUANGUO":
pobj.area = "全国";
break;
default: default:
break; break;
} }
......
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
...@@ -51,7 +51,8 @@ const cityLetter = { ...@@ -51,7 +51,8 @@ const cityLetter = {
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN", "海南":"HAINAN",
"广州":"GUANGZHOU", "广州":"GUANGZHOU",
"深圳":"SHENZHEN" "深圳":"SHENZHEN",
"全国":"QUANGUO"
} }
//baidu pinyinzhuanyong 2020-11-6 //baidu pinyinzhuanyong 2020-11-6
......
center-channel/app/base/service/impl/common/ncSve.js
...@@ -43,7 +43,8 @@ const cityLetter = { ...@@ -43,7 +43,8 @@ const cityLetter = {
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN", "海南":"HAINAN",
"广州":"GUANGZHOU", "广州":"GUANGZHOU",
"深圳":"SHENZHEN" "深圳":"SHENZHEN",
"全国":"QUANGUO"
} }
//百度拼音转义 2020-11-11 laolan //百度拼音转义 2020-11-11 laolan
......
center-channel/app/base/service/impl/common/rtSve.js
...@@ -42,7 +42,8 @@ const cityLetter = { ...@@ -42,7 +42,8 @@ const cityLetter = {
"外资":"WAIZI", "外资":"WAIZI",
"海南":"HAINAN", "海南":"HAINAN",
"广州":"GUANGZHOU", "广州":"GUANGZHOU",
"深圳":"SHENZHEN" "深圳":"SHENZHEN",
"全国":"QUANGUO"
} }
//百度拼音转义 2020-11-11 laolan //百度拼音转义 2020-11-11 laolan
......
center-channel/app/base/service/impl/common/signSve.js
...@@ -134,21 +134,21 @@ module.exports = SignService; ...@@ -134,21 +134,21 @@ module.exports = SignService;
// "status":"16" // "status":"16"
// } // }
// var obj = { // var obj = {
// "bizId":"OD2020110629779501", // "bizId": "OD2020111241779233",
// "companyInfo":{ // "companyInfo": {
// "companyName":"苏州磐荣信息科技有限公司", // "corpName": "上海王勇商务软件系统有限公司",
// "taxpayerTypeEnum":"NORMAL_TAXPAYER", // "taxpayerTypeEnum": "NORMAL_TAXPAYER",
// "acctgSystemId":"10001", // "acctgSystemId": "10008",
// "enterpriseFormEnum":"1", // "enterpriseFormEnum": "OTHERS",
// "taxIndustryId":1, // "taxIndustryId": 10000,
// "taxNo":"123456789", // "taxNo": "91310114772112002K",
// "serviceTypeEnum":"ACCOUTING", // "serviceTypeEnum": "ACCOUTING",
// "taxClaimMethodEnum":"TAX_DECLARATION" // "taxClaimMethodEnum": "TAX_DECLARATION"
// }, // },
// "contactMobile":"18550295628", // "contactMobile": "16710500888",
// "contactName":"范锋华", // "contactName": "王勇",
// "timeUnit":"year", // "quantity": 1,
// "quantity":1 // "timeUnit": "year"
// } // }
// } // }
......
center-channel/app/config/settings.js
...@@ -381,6 +381,11 @@ var settings = { ...@@ -381,6 +381,11 @@ var settings = {
} }
} else { } else {
// 2020 1106 lin 正式环境还未给出 // 2020 1106 lin 正式环境还未给出
// 2020 1119 lin 正式环境已经给出，鲁班说不变 后期可能换成动态的
return {
appid: "10015683988",
appkey: "b74b73acf78cc2851aa559e93c84f7888adq23we"
}
} }
}, },
pannongUrl: function() { pannongUrl: function() {
...@@ -388,6 +393,8 @@ var settings = { ...@@ -388,6 +393,8 @@ var settings = {
return "http://39.101.172.142:8980/" return "http://39.101.172.142:8980/"
} else { } else {
// 2020 1106 lin 正式环境还未给出 // 2020 1106 lin 正式环境还未给出
// 2020 1119 lin 正式环境已经给出，鲁班发的ip
return "http://139.196.159.202:8980/"
} }
} }
}; };
......
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