Skip to content

Z
zhichan
Commit 4e2ab126 by 任晓松
Options

Merge remote-tracking branch 'origin/center-channel' into center-channel

parents b8478bdb 72b3cd8b
Showing with 267 additions and 79 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)
...@@ -505,89 +564,141 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -505,89 +564,141 @@ class BaseCenterOrderService extends AppServiceBase {
var result = await this.utilsPushSve.business2Channel(reqPushParams, "serviceProviderSubmit2Material"); var result = await this.utilsPushSve.business2Channel(reqPushParams, "serviceProviderSubmit2Material");
console.log('result+++-cailiao--++++----',result) console.log('result+++-cailiao--++++----',result)
console.log('result+++-reqPushParams--++++----',reqPushParams) console.log('result+++-reqPushParams--++++----',reqPushParams)
}else{ }else{
if(res.data.uapp_id == uappId.ali){ if(res.data.uapp_id == uappId.ali){
//推送数据至阿里 //推送数据至阿里
var BizId = needsolution.channelSolutionNo;//⽅案业务ID var BizId = needsolution.channelSolutionNo;//⽅案业务ID
var pushObj = { var pushObj = {
"CompanyName":material.CompanyName, "CompanyName":material.CompanyName,
"BizId": BizId, "BizId": BizId,
"Domain": material.Domain, "Domain": material.Domain,
"CorporateName": material.CorporateName, "CorporateName": material.CorporateName,
"IncludeForeignInvestment": material.IncludeForeignInvestment, "IncludeForeignInvestment": material.IncludeForeignInvestment,
"PartnerBusinessLicense": material.PartnerBusinessLicense, "PartnerBusinessLicense": material.PartnerBusinessLicense,
"PartnerIdCardList": material.PartnerIdCardList, "PartnerIdCardList": material.PartnerIdCardList,
"PartnerDomainCertificate": material.PartnerDomainCertificate, "PartnerDomainCertificate": material.PartnerDomainCertificate,
"PartnerPreviewOtherList": material.PartnerPreviewOtherList || [], "PartnerPreviewOtherList": material.PartnerPreviewOtherList || [],
"PartnerPlan": material.PartnerPlan || "", "PartnerPlan": material.PartnerPlan || "",
"PartnerForeignInvestment": material.PartnerForeignInvestment || "", "PartnerForeignInvestment": material.PartnerForeignInvestment || "",
"PartnerLaw": material.PartnerLaw || "", "PartnerLaw": material.PartnerLaw || "",
"PartnerStampOtherList": material.PartnerStampOtherList || [], "PartnerStampOtherList": material.PartnerStampOtherList || [],
"PartnerSignOtherList": material.PartnerSignOtherList || [], "PartnerSignOtherList": material.PartnerSignOtherList || [],
"PartnerSignAndStampOtherList": material.PartnerSignAndStampOtherList || [] "PartnerSignAndStampOtherList": material.PartnerSignAndStampOtherList || []
}; };
var self = this; var self = this;
//推送方案材料 //推送方案材料
var ali =await self.aliclient.reqbyget({ action: "SavePartnerSubmitMaterial", reqbody: pushObj, apiVersion: "2019-05-08" }); var ali =await self.aliclient.reqbyget({ action: "SavePartnerSubmitMaterial", reqbody: pushObj, apiVersion: "2019-05-08" });
console.log('ali tui ziliao ++',ali) console.log('ali tui ziliao ++',ali)
if(ali && ali.status == 200){ if(ali && ali.status == 200){
var aliFlag = 200 var aliFlag = 200
}else{ }else{
var aliFlag = -200 var aliFlag = -200
}
} }
}
if(res.data.uapp_id == uappId.baidu){ if(res.data.uapp_id == uappId.baidu){
//推送数据至百度 //推送数据至百度
var BizId = needsolution.orderChannelNo; var BizId = needsolution.orderChannelNo;
console.log('BizId++',BizId) console.log('BizId++',BizId)
var pushObj = { var pushObj = {
"businessLicense" : { "businessLicense" : {
"createdAt" : material.BusinessLicense.CreatedAt || "", "createdAt" : material.BusinessLicense.CreatedAt || "",
"enterpriseCode" :material.BusinessLicense.EnterpriseCode || "", "enterpriseCode" :material.BusinessLicense.EnterpriseCode || "",
"legalRepresentative" :material.BusinessLicense.LegalRepresentative || "", "legalRepresentative" :material.BusinessLicense.LegalRepresentative || "",
"address" :material.BusinessLicense.Address || "", "address" :material.BusinessLicense.Address || "",
"registeredCapital" : material.BusinessLicense.RegisteredCapital || "", "registeredCapital" : material.BusinessLicense.RegisteredCapital || "",
"name" :material.BusinessLicense.Name || "", "name" :material.BusinessLicense.Name || "",
"businessTerm" :material.BusinessLicense.BusinessTerm || "", "businessTerm" :material.BusinessLicense.BusinessTerm || "",
"type" : material.BusinessLicense.Type || "", "type" : material.BusinessLicense.Type || "",
"scopeBusiness" :material.BusinessLicense.ScopeBusiness || "" "scopeBusiness" :material.BusinessLicense.ScopeBusiness || ""
}, },
"partnerForeignInvestment": material.PartnerForeignInvestment || "", "partnerForeignInvestment": material.PartnerForeignInvestment || "",
"orderNo": BizId, "orderNo": BizId,
"domain": material.Domain, "domain": material.Domain,
"corporateName": material.CorporateName, "corporateName": material.CorporateName,
"includeForeignInvestment": material.IncludeForeignInvestment, "includeForeignInvestment": material.IncludeForeignInvestment,
"partnerBusinessLicense": material.PartnerBusinessLicense, "partnerBusinessLicense": material.PartnerBusinessLicense,
"partnerIdCardList": material.PartnerIdCardList, "partnerIdCardList": material.PartnerIdCardList,
"partnerDomainCertificate": material.PartnerDomainCertificate, "partnerDomainCertificate": material.PartnerDomainCertificate,
"partnerPreviewOtherList": material.PartnerPreviewOtherList || [], "partnerPreviewOtherList": material.PartnerPreviewOtherList || [],
"partnerPlan": material.PartnerPlan || "", "partnerPlan": material.PartnerPlan || "",
"partnerLaw": material.PartnerLaw || "", "partnerLaw": material.PartnerLaw || "",
"partnerStampOtherList": material.PartnerStampOtherList || [], "partnerStampOtherList": material.PartnerStampOtherList || [],
"partnerSignOtherList": material.PartnerSignOtherList || [], "partnerSignOtherList": material.PartnerSignOtherList || [],
"partnerSignAndStampOtherList": material.PartnerSignAndStampOtherList || [] "partnerSignAndStampOtherList": material.PartnerSignAndStampOtherList || []
}; };
var self = this; var self = this;
//推送方案材料 //推送方案材料
var baidu = await self.baiduclient.baiduReqbyget({ path: "/api/bla/provider/license/material", reqbody: pushObj }); var baidu = await self.baiduclient.baiduReqbyget({ path: "/api/bla/provider/license/material", reqbody: pushObj });
console.log('baidu tui ziliao +++++',baidu) console.log('baidu tui ziliao +++++',baidu)
console.log('baidu pushObj ziliao +++++',pushObj) console.log('baidu pushObj ziliao +++++',pushObj)
if(baidu && baidu.data && baidu.data.result){ if(baidu && baidu.data && baidu.data.result){
var baiduFlag = 200 var baiduFlag = 200
}else{ }else{
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){
return system.getResultSuccess();
} }
} }
if(aliFlag == 200 || baiduFlag == 200){ console.log('rsrsr++++------------++++',res)
return system.getResultSuccess();
}
}
console.log('rsrsr++++------------++++',res)
return res return res
} }
return res return res
} }
//队列通知交付状态变更 //队列通知交付状态变更
async serviceProvider2Notification(pobj){ async serviceProvider2Notification(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,7 +861,7 @@ class BaseCenterOrderService extends AppServiceBase { ...@@ -727,7 +861,7 @@ 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();
} }
} }
......
center-channel/app/base/service/impl/common/centerorderSve.js
...@@ -648,6 +648,13 @@ class CenterorderService extends AppServiceBase { ...@@ -648,6 +648,13 @@ class CenterorderService extends AppServiceBase {
pobj.actionBody.regType = "baidu.radiotv"; pobj.actionBody.regType = "baidu.radiotv";
} }
if(pobj && pobj.appInfo && pobj.appInfo.uapp_id && pobj.appInfo.uapp_id=='52'){
if (pobj.actionBody.channelItemCode == '5') {
pobj.actionBody.regType = "ename.icp";
} else if (pobj.actionBody.channelItemCode == '7') {
pobj.actionBody.regType = "ename.edi";
}
}
var fqobj = { var fqobj = {
actionBody: { actionBody: {
area: pobj.actionBody.province, area: pobj.actionBody.province,
......
center-channel/app/base/service/impl/common/signSve.js
...@@ -115,7 +115,7 @@ class SignService{ ...@@ -115,7 +115,7 @@ class SignService{
} }
module.exports = SignService; module.exports = SignService;
// var task = new SignService(); var task = new SignService();
// var obj = { // var obj = {
// "actionType": "serviceProviderSubmitMaterial", // "actionType": "serviceProviderSubmitMaterial",
// "actionBody": { // "actionBody": {
...@@ -176,6 +176,18 @@ module.exports = SignService; ...@@ -176,6 +176,18 @@ module.exports = SignService;
// } // }
// } // }
// task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{ // var obj={
// "bizId": "yiming_solution_test_0001",
// "isDirectBuy": 0,
// "orderNo": "yiming_order_test_0001",
// "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/service/impl/utilsSve/utilsNeedSve.js
...@@ -1433,6 +1433,16 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1433,6 +1433,16 @@ class UtilsNeedService extends AppServiceBase {
pobj.actionBody.type = "baidu.radiotv"; pobj.actionBody.type = "baidu.radiotv";
pobj.actionBody.idempotentSource = "baidu_radiotv"; pobj.actionBody.idempotentSource = "baidu_radiotv";
} }
if(pobj.appInfo && pobj.appInfo.uapp_id && pobj.appInfo.uapp_id=="52"){
if (pobj.actionBody.channel_type_code == 5) {
pobj.actionBody.type = "ename.icp";
pobj.actionBody.idempotentSource = "ename_icp";
} else if (pobj.actionBody.channel_type_code == 7) {
pobj.actionBody.type = "ename.edi";
pobj.actionBody.idempotentSource = "ename_edi";
}
}
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";
} else { } else {
......
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;
}
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') {
......
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