Skip to content

Z
zhichan
Commit ef09d3d9 by 宋毅
Options

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

parents c5f7183c 6301c103
Showing with 180 additions and 8 deletions
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
...@@ -5,7 +5,8 @@ const AppServiceBase = require("../../app.base"); ...@@ -5,7 +5,8 @@ const AppServiceBase = require("../../app.base");
const uappId = { const uappId = {
'ali':"18", //(阿里icp、edi) 'ali':"18", //(阿里icp、edi)
'baidu':"44", //(百度icp、edi) 'baidu':"44", //(百度icp、edi)
'zc360':"50" //360icp、edi 'zc360':"50", //360icp、edi
"ename":"52" //易名
} }
//tui song baidu zhuanyong pinyin 2020-11-6 //tui song baidu zhuanyong pinyin 2020-11-6
const cityLetter = { const cityLetter = {
...@@ -154,6 +155,24 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -154,6 +155,24 @@ class BaseCenterOrderService extends AppServiceBase {
console.log('pushObj++',pushObj) console.log('pushObj++',pushObj)
var pushIcpSolutionRes = await this.pushBaiduIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self); var pushIcpSolutionRes = await this.pushBaiduIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
} }
if(needinfo.uapp_id == uappId.ename){
//推送数据至易名
// var bizType = needinfo.channelTypeCode;//业务类型里
solution.Area = cityLetter[solution.Area]
console.log('solution.Area++',solution.Area)
var pushObj = {
IntentionBizId: needinfo.channelNeedNo,
CompanyName: solution.CompanyName,
CompanyAddress: solution.CompanyAddress,
Area: solution.Area,
IcpType:solution.IcpType
};
if (needsolution.channelSolutionNo) {
pushObj["BizId"] = needsolution.channelSolutionNo;
}
console.log('pushObj++',pushObj);
var pushIcpSolutionRes = await this.pushEnameIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
}
this.logCtl.info({ this.logCtl.info({
appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "", appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "", appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
...@@ -275,6 +294,46 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -275,6 +294,46 @@ class BaseCenterOrderService extends AppServiceBase {
return pushRes; return pushRes;
} }
//推送ICP方案易名 2021-02-25 庄冰
async pushEnameIcpSolution(pushObj, solutionNo, appInfo, self) {
console.log('pushObj++Ename+++',pushObj);
//推送方案信息
var rtn = await self.execClient.execEnamePost(pushObj, settings.enameClientUrl()+"SubmitIcpSolution");
console.log("url+++++",settings.enameClientUrl()+"SubmitIcpSolution")
console.log("rtn+++++",rtn)
if (!rtn || !rtn.stdout) {
return system.getResult(null, "execPost data is empty");
}
var pushRes = JSON.parse(rtn.stdout);
// var pushRes = await self.baiduclient.baiduReqbyget({ path: "/api/bla/provider/plan", reqbody: pushObj });
console.log("pushRes++++",pushRes)
if (pushRes && pushRes.ErrorCode == "200" && pushRes.Success==true && pushRes.BizId) {
var reqObj2 = {
actionType: "receiveProgrammeNo",
appInfo: appInfo,
actionBody: {
solutionNo: solutionNo,
solutionBizId: pushRes.BizId
}
};
var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id
console.log("保存渠道方案id aaaa++ ",a)
// if (a && a.status == 0 && resData.path) {
// var reqObj3 = {
// actionType: "receiveIcpConfirmUrl",
// appInfo: appInfo,
// actionBody: {
// solutionNo: solutionNo,
// confirmUrl: pushRes.path
// }
// };
// var url = await self.reqCenterOrderApi(reqObj3);//保存用户确认方案url
// console.log('save confirmUrl ++ ',url)
// }
}
return pushRes;
}
//推送ICP方案baidu 2020-10-26 laolan //推送ICP方案baidu 2020-10-26 laolan
async pushBaiduIcpSolution(pushObj, solutionNo, appInfo, self) { async pushBaiduIcpSolution(pushObj, solutionNo, appInfo, self) {
console.log('pushObj++baidu+++',pushObj) console.log('pushObj++baidu+++',pushObj)
...@@ -579,6 +638,57 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -579,6 +638,57 @@ class BaseCenterOrderService extends AppServiceBase {
var baiduFlag = -200 var baiduFlag = -200
} }
} }
if(res.data.uapp_id == uappId.ename){
var aliFlag = -200;
//推送数据至易名
var BizId = needsolution.channelSolutionNo;//⽅案业务ID
var pushObj = {
"CompanyName":material.CompanyName,
// "BizId": BizId,
"OrderNo": BizId,
"Domain": material.Domain,
"CorporateName": material.CorporateName,
"IncludeForeignInvestment": material.IncludeForeignInvestment,
"PartnerBusinessLicense": material.PartnerBusinessLicense,
"PartnerIdCardList": material.PartnerIdCardList,
"PartnerDomainCertificate": material.PartnerDomainCertificate,
"PartnerPreviewOtherList": material.PartnerPreviewOtherList || [],
"PartnerPlan": material.PartnerPlan || "",
"PartnerForeignInvestment": material.PartnerForeignInvestment || "",
"PartnerLaw": material.PartnerLaw || "",
"PartnerStampOtherList": material.PartnerStampOtherList || [],
"PartnerSignOtherList": material.PartnerSignOtherList || [],
"PartnerSignAndStampOtherList": material.PartnerSignAndStampOtherList || [],
"BusinessLicense" : {
"CreatedAt" : material.BusinessLicense.CreatedAt || "",
"EnterpriseCode" :material.BusinessLicense.EnterpriseCode || "",
"LegalRepresentative" :material.BusinessLicense.LegalRepresentative || "",
"Address" :material.BusinessLicense.Address || "",
"RegisteredCapital" : material.BusinessLicense.RegisteredCapital || "",
"Name" :material.BusinessLicense.Name || "",
"BusinessTerm" :material.BusinessLicense.BusinessTerm || "",
"Type" : material.BusinessLicense.Type || "",
"ScopeBusiness" :material.BusinessLicense.ScopeBusiness || ""
},
};
var self = this;
//推送方案材料
var rtn = await self.execClient.execEnamePost(pushObj, settings.enameClientUrl()+"SavePartnerSubmitMaterial");
console.log("url+++++",settings.enameClientUrl()+"SavePartnerSubmitMaterial")
console.log("rtn+++++",rtn)
if (!rtn || !rtn.stdout) {
aliFlag = -200;
}else{
var pushRes = JSON.parse(rtn.stdout);
if(pushRes && pushRes.Success && pushRes.Success==true){
aliFlag == 200;
}else{
aliFlag == -200;
}
}
}
if(aliFlag == 200 || baiduFlag == 200){ if(aliFlag == 200 || baiduFlag == 200){
return system.getResultSuccess(); return system.getResultSuccess();
} }
...@@ -586,9 +696,10 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -586,9 +696,10 @@ class BaseCenterOrderService extends AppServiceBase {
console.log('rsrsr++++------------++++',res) console.log('rsrsr++++------------++++',res)
return res return res
} }
return res
} }
//队列通知交付状态变更 //队列通知交付状态变更
async serviceProvider2Notification(pobj){ async serviceProvider2Notification(pobj){
console.log("serviceProvider2Notification+++++pobj+++",pobj) console.log("serviceProvider2Notification+++++pobj+++",pobj)
...@@ -699,6 +810,29 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -699,6 +810,29 @@ class BaseCenterOrderService extends AppServiceBase {
} }
} }
if(res.data.uapp_id == uappId.ename){
var enameFlag =-200;
//推送数据至易名
var pushObj = {
OrderNo: res.data.channelOrderNo,
OfficialFileURL: res.data.OfficialFileURL,
ApplicationStatus: res.data.ApplicationStatus
};
var rtn = await this.execClient.execEnamePost(pushObj, settings.enameClientUrl()+"AcceptPartnerNotification");
console.log("url+++++",settings.enameClientUrl()+"AcceptPartnerNotification")
console.log("rtn+++++",rtn)
if (!rtn || !rtn.stdout) {
enameFlag = -200;
}else{
var pushRes = JSON.parse(rtn.stdout);
if(pushRes && pushRes.Success && pushRes.Success==true){
enameFlag == 200;
}else{
enameFlag == -200;
}
}
}
if(res.data.uapp_id == uappId.baidu){ if(res.data.uapp_id == uappId.baidu){
res.data.ApplicationStatus = baiduIcpStatus[res.data.ApplicationStatus]; res.data.ApplicationStatus = baiduIcpStatus[res.data.ApplicationStatus];
console.log('res.data.channelOrderNo',res.data.channelOrderNo) console.log('res.data.channelOrderNo',res.data.channelOrderNo)
...@@ -727,13 +861,14 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -727,13 +861,14 @@ class BaseCenterOrderService extends AppServiceBase {
} }
} }
if(aliFlag == 200 || baiduFlag == 200 || zc360Flag == 200){ if(aliFlag == 200 || baiduFlag == 200 || zc360Flag == 200 || enameFlag == 200){
return system.getResultSuccess(); return system.getResultSuccess();
} }
} }
return res; return res;
} }
return res;
} }
//交付单关闭 //交付单关闭
async closeOrderDelivery(pobj) { async closeOrderDelivery(pobj) {
......
center-channel/app/base/service/impl/common/signSve.js
...@@ -176,6 +176,18 @@ module.exports = SignService; ...@@ -176,6 +176,18 @@ module.exports = SignService;
// } // }
// } // }
// task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{ // var obj={
// "bizId": "biz_ename_1614061894_test",
// "isDirectBuy": 0,
// "orderNo": "trade_ename_1614061894_test",
// "phone": "18506015665",
// "userName": "张三",
// "companyName": "测试有限公司2",
// "description": "测试11111111",
// "area": "1",
// "price": "1100",
// "consultType": "5"
// };
// task.createSign(obj,"5cdd926122894160o1q1e34us4738v76").then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!"); // console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
// }); // });
\ No newline at end of file
center-channel/app/base/utils/execClient.js
...@@ -18,6 +18,10 @@ class ExecClient { ...@@ -18,6 +18,10 @@ class ExecClient {
this.cmdBaiduPostPattern = "curl -k -H 'Content-type: application/json' -H 'Authorization: {Authorization}' -d '{data}' {url}"; this.cmdBaiduPostPattern = "curl -k -H 'Content-type: application/json' -H 'Authorization: {Authorization}' -d '{data}' {url}";
this.cmdGetpatternToken = "curl -G -k -H 'authorization:{token}' -d '{data}' {url}"; this.cmdGetpatternToken = "curl -G -k -H 'authorization:{token}' -d '{data}' {url}";
//易名
this.cmdEnamePostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' {url}";
} }
getUUID() { getUUID() {
var uuid = uuidv4(); var uuid = uuidv4();
...@@ -60,6 +64,14 @@ class ExecClient { ...@@ -60,6 +64,14 @@ class ExecClient {
console.log(cmd); console.log(cmd);
return cmd; return cmd;
} }
FetchEnamePostCmd(subData, url) {
var data = JSON.stringify(subData);
var cmd = this.cmdEnamePostPattern.replace(/\{data\}/g,
data).replace(/\{url\}/g, url);
console.log(cmd);
return cmd;
}
cmdEnamePostPattern
FetchPushDataPostCmd(subData, url, token, requestId) { FetchPushDataPostCmd(subData, url, token, requestId) {
var requestId = requestId || this.getUUID(); var requestId = requestId || this.getUUID();
var data = JSON.stringify(subData); var data = JSON.stringify(subData);
...@@ -90,6 +102,11 @@ class ExecClient { ...@@ -90,6 +102,11 @@ class ExecClient {
var result = await this.exec(cmd); var result = await this.exec(cmd);
return result; return result;
} }
async execEnamePost(subData, url) {
let cmd = this.FetchEnamePostCmd(subData, url);
var result = await this.exec(cmd);
return result;
}
async execPushDataPost(subData, url, token, requestId) { async execPushDataPost(subData, url, token, requestId) {
if(settings.env == 'dev'){ if(settings.env == 'dev'){
axios.defaults.headers['token'] = token; axios.defaults.headers['token'] = token;
......
center-channel/app/config/settings.js
...@@ -30,6 +30,13 @@ var settings = { ...@@ -30,6 +30,13 @@ var settings = {
} }
return "http://43.247.184.94:7200/center_channel_req_log/_doc?pretty"; return "http://43.247.184.94:7200/center_channel_req_log/_doc?pretty";
}, },
enameClientUrl:function(){
if (this.env == 'dev') {
return "https://ote.ename.com/icp/";
}else{
return "https://ote.ename.com/icp/";
}
},
//百度icp、edi、nc、rt //百度icp、edi、nc、rt
baiduClientParams: function () { baiduClientParams: function () {
if (this.env == 'dev') { if (this.env == 'dev') {
......
center-channel/app/front/entry/public/apidoc/platform/busservices.md
...@@ -102,7 +102,7 @@ https://fqdev.gongsibao.com 测试 ...@@ -102,7 +102,7 @@ https://fqdev.gongsibao.com 测试
"ENTTYPE": "有限责任公司(法人独资)", //企业类型 "ENTTYPE": "有限责任公司(法人独资)", //企业类型
"FRDB": "李丽", //法定代表人 "FRDB": "李丽", //法定代表人
"ENDDATE": "", //死亡日期 "ENDDATE": "", //死亡日期
"OPSCOPE": "技术开发、技术推广、技术转让、技术咨询、技术服务；计算机系统服务；数据处理(数据处理中的银行卡中心、PUE值在1.4以上的云计算数据中心除外)；基础软件服务；应用软件服务；软件开发；软件咨询；产品设计；模型设计；包装装潢设计；教育咨询；经济贸易咨询；文化咨询；体育咨询；公共关系服务；会议服务；工艺美术设计；电脑动画设计；企业策划；设计、制作、代理、发布广告；市场调查；企业管理咨询；组织文化艺术交流活动(不含营业性演出)；文艺创作；承办展览展示活动；影视策划；翻译服务；商标转让；商标代理；版权转让、版权代理；财务咨询(不得开展审计、验资、查帐、评估、会计咨询、代理记账等需经专项审批的业务,不得出具相应的审计报告、验资报告、查帐报告、评估报告等文字材料)；销售自行开发后的产品、机械设备、计算机、软件及辅助设备、通讯设备、电子产品、日用品、文化用品、工艺品；出租办公用房；机动车公共停车场服务；物业管理；健康咨询（须经审批的诊疗活动除外）；代理记账；经营电信业务；人力资源服务。（市场主体依法自主选择经营项目，开展经营活动；代理记账、经营电信业务、人力资源服务以及依法须经批准的项目，经相关部门批准后依批准的内容开展经营活动；不得从事国家和本市产业政策禁止和限制类项目的经营活动。）。", //经营业务范围 "OPSCOPE": "技术开发、技术推广、技术转让、技术咨询、技术服务；计算机系统服务。。。", //经营业务范围
"ESDATE": "2014-08-07", //成立日期 "ESDATE": "2014-08-07", //成立日期
"OPTO": "2034-08-06", //经营期限至 "OPTO": "2034-08-06", //经营期限至
"ENTNAME": "汉唐信通（北京）科技有限公司", //企业名称 "ENTNAME": "汉唐信通（北京）科技有限公司", //企业名称
...@@ -253,7 +253,7 @@ https://fqdev.gongsibao.com 测试 ...@@ -253,7 +253,7 @@ https://fqdev.gongsibao.com 测试
"FZL_VALIDITY": "公开", //专利有效性 "FZL_VALIDITY": "公开", //专利有效性
"FZL_ZLDLJG": "北京易知宝知识产权代理事务所(普通合伙) 11875", //专利代理机构 "FZL_ZLDLJG": "北京易知宝知识产权代理事务所(普通合伙) 11875", //专利代理机构
"FZL_DLR": "史琳琳", //代理人 "FZL_DLR": "史琳琳", //代理人
"FZL_ZY": "本公开提供一种基于知识图谱的企业商机挖掘方法及装置、计算设备及存储介质，其中所述基于知识图谱的企业商机挖掘方法，包括：对企业的各类数据进行数据处理，搭建知识图谱数据库；基于知识图谱数据库构建知识图谱结构模型，建立知识图谱；基于知识图谱确定触达客户企业的最短路径和路径触达概率；以及，基于知识图谱和触达客户企业的最短路径确定商机和商机触达概率；将所有客户企业的路径触达概率和商机触达概率加权相乘并排序，基于排序进行商机触达。" //摘要 "FZL_ZY": "本公开提供一种基于知识图谱的企业商机挖掘方法及装置、计算设备及存储介。。。" //摘要
} }
], ],
"msg": "success" "msg": "success"
...@@ -337,7 +337,7 @@ https://fqdev.gongsibao.com 测试 ...@@ -337,7 +337,7 @@ https://fqdev.gongsibao.com 测试
"APPDATE": "2019-11-27", //申请日期 "APPDATE": "2019-11-27", //申请日期
"UNIONTYPE": "45", //国际分类 "UNIONTYPE": "45", //国际分类
"UNIONTYPENAME": "社会服务", //国际分类名称 "UNIONTYPENAME": "社会服务", //国际分类名称
"TYPEDETAILDES": "计算机软件许可（法律服务）；域名注册（法律服务）；知识产权代理服务；互联网域名租赁；知识产权咨询；版权管理；知识产权许可；为法律咨询目的监控知识产权；法律研究；诉讼服务", //商品服务列表 "TYPEDETAILDES": "计算机软件许可（法律服务）；域名注册（法律服务）；知识产权代理。。。法律研究；诉讼服务", //商品服务列表
"BEGINDATE": "", //专用期起 "BEGINDATE": "", //专用期起
"ENDDATE": "", //专用期止 "ENDDATE": "", //专用期止
"CHECKDATE": "", //初审公告日期 "CHECKDATE": "", //初审公告日期
...@@ -1055,7 +1055,7 @@ https://fqdev.gongsibao.com 测试 ...@@ -1055,7 +1055,7 @@ https://fqdev.gongsibao.com 测试
{ {
"MARKTYPE": "一般", //商标类型 "MARKTYPE": "一般", //商标类型
"REGVOLUMN": "", //注册公告期 "REGVOLUMN": "", //注册公告期
"TYPEDETAILDES": "计算机软件许可（法律服务）；域名注册（法律服务）；知识产权代理服务；互联网域名租赁；知识产权咨询；版权管理；知识产权许可；为法律咨询目的监控知识产权；法律研究；诉讼服务", //商品服务列表 "TYPEDETAILDES": "计算机软件许可（法律服务）；域名注册（法律服务）。。。法律研究；诉讼服务", //商品服务列表
"REGDATE": "", //注册公告日期 "REGDATE": "", //注册公告日期
"TYPEDETAIL": "4506；4505", //类似群 "TYPEDETAIL": "4506；4505", //类似群
"ISCOLOR": "", //指定颜色 "ISCOLOR": "", //指定颜色
......
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