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

center-channel/app/base/api/impl/icp/consultation.js

@@ -272,6 +272,9 @@ class Consultation extends APIBase {
                 case "SHENZHEN":
                     pobj.area = "深圳";
                     break;
+                case "QUANGUO":
+                    pobj.area = "全国";
+                    break;
                 default:
                     break;
             }

center-channel/app/base/service/impl/common/baseCenterOrderSve.js

@@ -51,7 +51,8 @@ const cityLetter = {
   "外资":"WAIZI",
   "海南":"HAINAN",
   "广州":"GUANGZHOU",
-  "深圳":"SHENZHEN"
+  "深圳":"SHENZHEN",
+  "全国":"QUANGUO"
 }
 
 //baidu pinyinzhuanyong 2020-11-6

center-channel/app/base/service/impl/common/ncSve.js

@@ -43,7 +43,8 @@ const cityLetter = {
   "外资":"WAIZI",
   "海南":"HAINAN",
   "广州":"GUANGZHOU",
-  "深圳":"SHENZHEN"
+  "深圳":"SHENZHEN",
+  "全国":"QUANGUO"
 }
 
 //百度拼音转义 2020-11-11 laolan

center-channel/app/base/service/impl/common/rtSve.js

@@ -42,7 +42,8 @@ const cityLetter = {
   "外资":"WAIZI",
   "海南":"HAINAN",
   "广州":"GUANGZHOU",
-  "深圳":"SHENZHEN"
+  "深圳":"SHENZHEN",
+  "全国":"QUANGUO"
 }
 
 //百度拼音转义 2020-11-11 laolan

center-channel/app/base/service/impl/common/signSve.js

@@ -134,21 +134,21 @@ module.exports = SignService;
 // 	"status":"16"
 // }
 // var obj = {
-// 	"bizId":"OD2020110629779501",
-// 	"companyInfo":{
-// 		"companyName":"苏州磐荣信息科技有限公司",
-// 		"taxpayerTypeEnum":"NORMAL_TAXPAYER",
-// 		"acctgSystemId":"10001",
-// 		"enterpriseFormEnum":"1",
-// 		"taxIndustryId":1,	
-// 		"taxNo":"123456789",
-// 		"serviceTypeEnum":"ACCOUTING",
-// 		"taxClaimMethodEnum":"TAX_DECLARATION"
+//   "bizId": "OD2020111241779233",
+//   "companyInfo": {
+//       "corpName": "上海王勇商务软件系统有限公司",
+//       "taxpayerTypeEnum": "NORMAL_TAXPAYER",
+//       "acctgSystemId": "10008",
+//       "enterpriseFormEnum": "OTHERS",
+//       "taxIndustryId": 10000,
+//       "taxNo": "91310114772112002K",
+//       "serviceTypeEnum": "ACCOUTING",
+//       "taxClaimMethodEnum": "TAX_DECLARATION"
 //   },
-//     "contactMobile":"18550295628",
-//     "contactName":"范锋华",
-// 	"timeUnit":"year",
-// 	"quantity":1
+//   "contactMobile": "16710500888",
+//   "contactName": "王勇",
+//   "quantity": 1,
+//   "timeUnit": "year"
 // }
 
 // }

center-channel/app/config/settings.js

@@ -381,6 +381,11 @@ var settings = {
       }
     } else {
       // 2020 1106 lin 正式环境还未给出
+      // 2020 1119 lin 正式环境已经给出，鲁班说不变 后期可能换成动态的
+      return {
+        appid: "10015683988",
+        appkey: "b74b73acf78cc2851aa559e93c84f7888adq23we"
+      }
     }
   },
   pannongUrl: function() {
@@ -388,6 +393,8 @@ var settings = {
       return "http://39.101.172.142:8980/"
     } else {
       // 2020 1106 lin 正式环境还未给出
+      // 2020 1119 lin 正式环境已经给出，鲁班发的ip
+      return "http://139.196.159.202:8980/"
     }
   }
 };