Skip to content

Z
zhichan
Commit 822fe5fa by 兰国旗
Options

laolan

parent 61d38797
Showing with 9 additions and 39 deletions
center-channel/app/base/service/impl/common/regCenterOrderSve.js
...@@ -95,6 +95,7 @@ async regPaySuccess(pobj) { ...@@ -95,6 +95,7 @@ async regPaySuccess(pobj) {
return system.getResultFail(-5011, "方案查询失败"); return system.getResultFail(-5011, "方案查询失败");
} }
var solutiondata = JSON.parse(solutionrtn.stdout); var solutiondata = JSON.parse(solutionrtn.stdout);
console.log('solutiondata----',solutiondata)
if (solutiondata.status != 0) { if (solutiondata.status != 0) {
return system.getResultFail(-5011, "方案查询失败"); return system.getResultFail(-5011, "方案查询失败");
} }
...@@ -110,15 +111,16 @@ async regPaySuccess(pobj) { ...@@ -110,15 +111,16 @@ async regPaySuccess(pobj) {
var fqobj = { var fqobj = {
actionBody: { actionBody: {
area: pobj.actionBody.province, area: pobj.actionBody.province,
idempotentSource: pobj.actionBody.regType, idempotentSource: data.data.serviceBusinessCode,
orderNo: pobj.actionBody.channelOrder.channelOrderNo, orderNo: pobj.actionBody.channelOrder.channelOrderNo,
orderPrice: Number(pobj.actionBody.orderPrice / 100), orderPrice: Number(pobj.actionBody.orderPrice / 100),
phone: pobj.actionBody.publishMobile, phone: pobj.actionBody.publishMobile,
needId: solutiondata.data.channelNeedNo, needId: solutiondata.data.channelNeedNo
companyName:solutiondata.data.solutionContent.solution.CompanyName || '' // companyName:solutiondata.data.solutionContent.CompanyName || ''
}, },
appInfo: pobj.appInfo appInfo: pobj.appInfo
} }
console.log('fqobj----',fqobj)
var baiduPushRes = await this.utilsPushSve.baiduBusiness2Fq(fqobj, "pushOrderICPBusinessNew"); var baiduPushRes = await this.utilsPushSve.baiduBusiness2Fq(fqobj, "pushOrderICPBusinessNew");
var deliveryObj = { var deliveryObj = {
actionBody: { actionBody: {
...@@ -187,7 +189,7 @@ async regPaySuccess(pobj) { ...@@ -187,7 +189,7 @@ async regPaySuccess(pobj) {
if (!actionBody.bizId) { if (!actionBody.bizId) {
return system.getResult(null, "actionBody.bizId can not be empty，100390"); return system.getResult(null, "actionBody.bizId can not be empty，100390");
} }
var reqUrl = this.centerOrderUrl + "action/regCenterOrderSve/springBoard"; var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
var itemResult = await this.restPostUrl(pobj, reqUrl); var itemResult = await this.restPostUrl(pobj, reqUrl);
return itemResult; return itemResult;
} }
...@@ -216,7 +218,6 @@ async regPaySuccess(pobj) { ...@@ -216,7 +218,6 @@ async regPaySuccess(pobj) {
pobj.actionBody.type_name = data.data.type_name; pobj.actionBody.type_name = data.data.type_name;
pobj.actionBody.channel_type_code = data.data.channel_type_code; pobj.actionBody.channel_type_code = data.data.channel_type_code;
pobj.actionBody.channel_type_name = data.data.channel_type_name; pobj.actionBody.channel_type_name = data.data.channel_type_name;
// pobj.actionBody.type = pobj.actionBody.channel_type_code;
if (pobj.actionBody.channel_type_code) { if (pobj.actionBody.channel_type_code) {
pobj.actionBody.type = regCfg.channelTypeCode[pobj.actionBody.channel_type_code] pobj.actionBody.type = regCfg.channelTypeCode[pobj.actionBody.channel_type_code]
} }
...@@ -242,12 +243,6 @@ async regPaySuccess(pobj) { ...@@ -242,12 +243,6 @@ async regPaySuccess(pobj) {
var reqUrl = this.centerOrderUrl + "action/regapi/springBoard"; var reqUrl = this.centerOrderUrl + "action/regapi/springBoard";
var result = await this.restPostUrl(pobj, reqUrl); var result = await this.restPostUrl(pobj, reqUrl);
if (result.status == 0) { if (result.status == 0) {
// var reqParams = {
// actionBody: pobj.actionBody,
// appInfo: pobj.appInfo
// }
// this.utilsPushSve.baiduBusiness2Delivery(reqParams, "addChance");
pobj.actionBody.description = pobj.actionBody.description + " 成交概率：" + pobj.actionBody.level pobj.actionBody.description = pobj.actionBody.description + " 成交概率：" + pobj.actionBody.level
if (pobj.actionBody.probability) { if (pobj.actionBody.probability) {
pobj.actionBody.description = pobj.actionBody.description + "（" + pobj.actionBody.probability + "） " pobj.actionBody.description = pobj.actionBody.description + "（" + pobj.actionBody.probability + "） "
...@@ -376,31 +371,6 @@ async regFeedbackSubmit(pobj, reqUrl) { ...@@ -376,31 +371,6 @@ async regFeedbackSubmit(pobj, reqUrl) {
return rtn; return rtn;
} }
//通知交付状态变更
// async serviceProviderNotification(pobj) {
// console.log('zhuangtai ++++',pobj)
// var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
// if (res && res.status == 0 && res.data) {
// if(res.data.uapp_id == regCfg.uappId.baidu){
// res.data.ApplicationStatus = baiduRegStatus[res.data.ApplicationStatus];
// console.log('res.data.channelOrderNo',res.data.channelOrderNo)
// //推送数据至百度
// var pushObj = {
// orderNo: res.data.channelOrderNo,
// status: res.data.ApplicationStatus
// };
// //推送状态变更
// var baidu = await this.baiduclient.baiduReqbyget({ path: "/api/bla/provider/license/update", reqbody: pushObj });
// console.log('res.data baidu +++++',baidu)
// return res;
// }
// }
// }
//--------------3. //--------------3.
//提交reg注册方案 //提交reg注册方案
async regSubmitSolution(pobj) { async regSubmitSolution(pobj) {
...@@ -557,8 +527,8 @@ async regFeedbackSubmit(pobj, reqUrl) { ...@@ -557,8 +527,8 @@ async regFeedbackSubmit(pobj, reqUrl) {
//提交交付信息/修改订单状态 //提交交付信息/修改订单状态
async regUpdateOrderStatus(pobj) { async regUpdateOrderStatus(pobj) {
var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard"); var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
console.log('zzzzlllll+++++',res) console.log('推送交付信息/修改订单状态res+++++',res)
console.log('zzzzlllll++pobj+++',pobj) console.log('推送交付信息/修改订单状态baidu++pobj+++',pobj)
if (res && res.status == 0 && res.data) { if (res && res.status == 0 && res.data) {
var needsolution = res.data;//方案信息 var needsolution = res.data;//方案信息
var deliverContent = { var deliverContent = {
...@@ -578,7 +548,7 @@ async regFeedbackSubmit(pobj, reqUrl) { ...@@ -578,7 +548,7 @@ async regFeedbackSubmit(pobj, reqUrl) {
}; };
var self = this; var self = this;
//推送交付信息/修改订单状态 //推送交付信息/修改订单状态
var baidu = await self.baiduRegClient.baiduReqbyget({ path: "/v1/provider/order", reqbody: pushObj }); var baidu = await self.baiduRegClient.baiduReqbyget({ path: "/v1/provider/comreg", reqbody: pushObj });
console.log('推送交付信息/修改订单状态baidu+++',baidu) console.log('推送交付信息/修改订单状态baidu+++',baidu)
} }
console.log('rsrsr++++------------++++',res) console.log('rsrsr++++------------++++',res)
......
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