Commit 3cbb00d3 by 庄冰

baiduIcp

parent b8876f8b
...@@ -581,7 +581,7 @@ class CenterorderService extends AppServiceBase { ...@@ -581,7 +581,7 @@ class CenterorderService extends AppServiceBase {
} }
pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId; pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
pobj.actionType = "receiveSolutionPayInfo"; pobj.actionType = "receiveSolutionPayInfoNew";
var url = settings.centerOrderUrl() + "action/icapi/springBoard"; var url = settings.centerOrderUrl() + "action/icapi/springBoard";
var solutionrtn = await this.execClient.execPost(pobj, url); var solutionrtn = await this.execClient.execPost(pobj, url);
if (!solutionrtn || !solutionrtn.stdout) { if (!solutionrtn || !solutionrtn.stdout) {
......
...@@ -1394,6 +1394,9 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1394,6 +1394,9 @@ class UtilsNeedService extends AppServiceBase {
async icpNotifyNew(pobj) { async icpNotifyNew(pobj) {
var actionBody = pobj.actionBody; var actionBody = pobj.actionBody;
var self = this; var self = this;
if(actionBody.isDirectBuy && actionBody.isDirectBuy==1){
actionBody.bizId = actionBody.orderNo
}
if (!actionBody.bizId) { if (!actionBody.bizId) {
return system.getResult(null, "actionBody.bizId can not be empty,100495"); return system.getResult(null, "actionBody.bizId can not be empty,100495");
} }
...@@ -1401,7 +1404,7 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1401,7 +1404,7 @@ class UtilsNeedService extends AppServiceBase {
if (!actionBody.status) { if (!actionBody.status) {
return system.getResult(null, "actionBody.status can not be empty,100495"); return system.getResult(null, "actionBody.status can not be empty,100495");
} }
pobj.actionType = "receiveIcpStatusNotify"; pobj.actionType = "receiveOrderStatusNotify";
var url = settings.centerOrderUrl() + "action/qcapi/springBoard"; var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
var rtn = await this.restPostUrl(pobj, url); var rtn = await this.restPostUrl(pobj, url);
if (actionBody.status == 2) { if (actionBody.status == 2) {
......
...@@ -282,7 +282,7 @@ module.exports = function (app) { ...@@ -282,7 +282,7 @@ module.exports = function (app) {
"needBatchUpload", "needBatchUpload",
"serviceSubmitOption","submitWangwenSolution","closeNeed","recordLog","recordLogList", "serviceSubmitOption","submitWangwenSolution","closeNeed","recordLog","recordLogList",
"foodServiceSubmitOption","submitFoodSolution","foodCloseNeed","foodRecordLog","foodRecordLogList", "foodServiceSubmitOption","submitFoodSolution","foodCloseNeed","foodRecordLog","foodRecordLogList",
"getParamsFor360","addOrderWeb","getPayRecords", "getParamsFor360","addOrderWeb","getPayRecords","icpNotifyNew",
]; ];
if (lst.indexOf(req.body.actionType) >= 0) { if (lst.indexOf(req.body.actionType) >= 0) {
...@@ -407,7 +407,7 @@ module.exports = function (app) { ...@@ -407,7 +407,7 @@ module.exports = function (app) {
req.body.appInfo = result.data; req.body.appInfo = result.data;
req.body.actionProcess = result.data.app_code; req.body.actionProcess = result.data.app_code;
var lst = [ var lst = [
"submitNeed", "paySuccess", "icpNotify" "submitNeed", "paySuccess", "icpNotify","icpNotifyNew"
]; ];
if (lst.indexOf(req.body.actionType) >= 0) { if (lst.indexOf(req.body.actionType) >= 0) {
var userpin = req.headers["userpin"] || ""; var userpin = req.headers["userpin"] || "";
......
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