Skip to content

Z
zhichan
Commit c13cd61c by 宋毅
Options

orderPrice

parent 8957a52f
Showing with 246 additions and 88 deletions
igirl-channel-gateway/app/base/service/impl/common/gatewaypushlogSve.js
......@@ -107,41 +107,41 @@ class GatewaypushlogService extends ServiceBase {
}
//支付回调
async paySuccess(pobj) {
var self = this;
if (!pobj.orderNo) {
return {"message":"orderNo不能为空","data":{},"code":-200};
return { "message": "orderNo不能为空", "data": {}, "code": -200 };
}
if (!pobj.orderPrice) {
return {"message":"orderPrice不能为空","data":{},"code":-200};
pobj.orderPrice = Number(pobj.orderPrice || "0");
if (pobj.orderPrice < 0) {
return { "message": "orderPrice不能为空", "data": {}, "code": -200 };
}
if (!pobj.phone) {
return {"message":"phone不能为空","data":{},"code":-200};
return { "message": "phone不能为空", "data": {}, "code": -200 };
}
if (pobj.companyName) {
if (!pobj.city) {
return {"message":"city不能为空","data":{},"code":-200};
return { "message": "city不能为空", "data": {}, "code": -200 };
}
if (!pobj.companyCategory) {
return {"message":"companyCategory不能为空","data":{},"code":-200};
return { "message": "companyCategory不能为空", "data": {}, "code": -200 };
}
if (!pobj.orgType) {
return {"message":"orgType不能为空","data":{},"code":-200};
return { "message": "orgType不能为空", "data": {}, "code": -200 };
}
if (!pobj.industryType) {
return {"message":"industryType不能为空","data":{},"code":-200};
return { "message": "industryType不能为空", "data": {}, "code": -200 };
}
if (!pobj.scope) {
return {"message":"scope不能为空","data":{},"code":-200};
return { "message": "scope不能为空", "data": {}, "code": -200 };
}
} else if (pobj.park) {
if (!pobj.productType) {
return {"message":"productType不能为空","data":{},"code":-200};
return { "message": "productType不能为空", "data": {}, "code": -200 };
}
} else {
return {"message":"参数异常","data":{},"code":-200};
return { "message": "参数异常", "data": {}, "code": -200 };
}
var param = {
requestId: self.getUUID(),
......@@ -153,11 +153,82 @@ class GatewaypushlogService extends ServiceBase {
pushStatus: "wts",//推送状态
}
await this.create(param);
return {"message":"true","data":{},"code":200};
return { "message": "true", "data": {}, "code": 200 };
}
//icp需求提交
async icpSubmitNeed(pobj) {
var self = this;
if (!pobj.intentionBizId) {
return self.getResultFail("intentionBizId不能为空");
}
if (!pobj.phone) {
return self.getResultFail("mobile不能为空");
}
if (!pobj.consultType) {
return self.getResultFail("consultType不能为空");
}
pobj.type = pobj.consultType;
var param = {
requestId: self.getUUID(),
requestUrl: "/api/ali/tm/consultation/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/queryOrderState",//调用地址
pushActionType: "icpSubmitNeed",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.create(param);
return self.getResultSuccess(param.requestId);
}
//icp需求反馈
async icpFeedbackSubmit(pobj) {
var self = this;
if (!pobj.intentionBizId) {
return self.getResultFail("intentionBizId不能为空");
}
if (!pobj.description) {
return self.getResultFail("description不能为空");
}
if (!pobj.intentionStatus) {
return self.getResultFail("intentionStatus不能为空");
}
var param = {
requestId: self.getUUID(),
requestUrl: "/api/ali/tm/feedback/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/queryOrderState",//调用地址
pushActionType: "icpFeedbackSubmit",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.create(param);
return self.getResultSuccess(param.requestId);
}
//icp状态变更
async icpNotify(pobj) {
var self = this;
if (!pobj.bizId) {
return self.getResultFail("bizId不能为空");
}
if (!pobj.status) {
return self.getResultFail("status不能为空");
}
var param = {
requestId: self.getUUID(),
requestUrl: "/api/ali/tm/feedback/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/queryOrderState",//调用地址
pushActionType: "icpNotify",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.create(param);
return self.getResultSuccess(param.requestId);
}
}
......
igirl-channel-gateway/app/base/service/impl/utilsSve/utilsNeedSve.js
......@@ -60,6 +60,9 @@ class UtilsNeedSve extends AppServiceBase {
};
}
var userpin = "";
if(pobj.phone&&!pobj.mobile){
pobj.mobile=pobj.phone;
}
if (pobj.mobile) {
//获取用户userpin
var userparam = {
......
igirl-channel-gateway/app/config/routes/api.js
......@@ -9,8 +9,8 @@ module.exports = function (app) {
app.use('/api/ali/esp/intention/submit', async function (req, res) {
try {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
......@@ -36,7 +36,7 @@ module.exports = function (app) {
});
app.use('/api/ali/esp/intention/solution/feedback', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
......@@ -61,7 +61,7 @@ module.exports = function (app) {
});
app.use('/api/ali/ic/paySuccess', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
......@@ -86,7 +86,7 @@ module.exports = function (app) {
});
app.use('/api/ali/ic/close', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
......@@ -111,7 +111,7 @@ module.exports = function (app) {
});
app.use('/api/ali/esp/intention/close', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
......@@ -136,19 +136,148 @@ module.exports = function (app) {
});
//test
app.use('/api/alitest/esp/intention/submit', async function (req, res) {
// //test
// app.use('/api/alitest/esp/intention/submit', async function (req, res) {
// try {
// console.log(req.headers['content-type'])
// if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
// await logCtl.applicationOctetStream2Json(req);
// }
// var client_ip = system.get_client_ip(req);
// req.body.action_type = "submitNeed";
// var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
// logCtl.info({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
// op: "api/ali/esp/intention/submit",
// content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
// clientIp: client_ip || ""
// });
// res.end(JSON.stringify(result));
// return JSON.stringify(result);
// } catch (error) {
// logCtl.error({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
// op: "/api/ali/esp/intention/submit",
// content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
// clientIp: client_ip || ""
// });
// return JSON.stringify(result);
// }
// });
// app.use('/api/alitest/esp/intention/solution/feedback', async function (req, res) {
// try {
// if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
// await logCtl.applicationOctetStream2Json(req);
// }
// var client_ip = system.get_client_ip(req);
// req.body.action_type = "receiveFeedback";
// var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
// logCtl.info({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
// op: "/api/ali/esp/intention/solution/feedback",
// content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
// clientIp: client_ip || ""
// });
// res.end(JSON.stringify(result));
// return JSON.stringify(result);
// } catch (error) {
// logCtl.error({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
// op: "/api/ali/esp/intention/solution/feedback",
// content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
// clientIp: client_ip || ""
// });
// }
// });
// app.use('/api/alitest/ic/paySuccess', async function (req, res) {
// try {
// if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
// await logCtl.applicationOctetStream2Json(req);
// }
// var client_ip = system.get_client_ip(req);
// req.body.action_type = "paySuccess";
// var result = await utilsNeedSve.paySuccess(req.body, client_ip);
// logCtl.info({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
// op: "/api/ali/ic/paySuccess",
// content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
// clientIp: client_ip || ""
// });
// res.end(JSON.stringify(result));
// return JSON.stringify(result);
// } catch (error) {
// logCtl.error({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
// op: "/api/ali/ic/paySuccess",
// content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
// clientIp: client_ip || ""
// });
// }
// });
// app.use('/api/alitest/ic/close', async function (req, res) {
// try {
// if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
// await logCtl.applicationOctetStream2Json(req);
// }
// var client_ip = system.get_client_ip(req);
// req.body.action_type = "orderClose";
// var result = await utilsNeedSve.orderClose(req.body, client_ip);
// logCtl.info({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
// op: "/api/ali/ic/close",
// content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
// clientIp: client_ip || ""
// });
// res.end(JSON.stringify(result));
// return JSON.stringify(result);
// } catch (error) {
// logCtl.error({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
// op: "/api/ali/ic/close",
// content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
// clientIp: client_ip || ""
// });
// }
// });
// app.use('/api/alitest/esp/intention/close', async function (req, res) {
// try {
// if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
// await logCtl.applicationOctetStream2Json(req);
// }
// var client_ip = system.get_client_ip(req);
// req.body.action_type = "needClose";
// var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
// logCtl.info({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
// op: "/api/ali/esp/intention/close",
// content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
// clientIp: client_ip || ""
// });
// res.end(JSON.stringify(result));
// return JSON.stringify(result);
// } catch (error) {
// logCtl.error({
// optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
// op: "/api/ali/esp/intention/close",
// content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
// clientIp: client_ip || ""
// });
// }
// });
app.use('/api/ali/tm/consultation/submit', async function (req, res) {
try {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
req.body.action_type = "submitNeed";
var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
req.body.action_type = "icpSubmitNeed";
var result = await gatewaypushlogSve.icpSubmitNeed(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
op: "api/ali/esp/intention/submit",
op: "api/ali/tm/consultation/submit",
content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
......@@ -157,24 +286,26 @@ module.exports = function (app) {
} catch (error) {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
op: "/api/ali/esp/intention/submit",
op: "/api/ali/tm/consultation/submit",
content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
clientIp: client_ip || ""
});
return JSON.stringify(result);
}
});
app.use('/api/alitest/esp/intention/solution/feedback', async function (req, res) {
app.use('/api/ali/tm/feedback/submit', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
req.body.action_type = "receiveFeedback";
var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
req.body.action_type = "icpFeedbackSubmit";
var result = await gatewaypushlogSve.icpFeedbackSubmit(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
op: "/api/ali/esp/intention/solution/feedback",
op: "api/ali/tm/feedback/submit",
content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
......@@ -183,48 +314,26 @@ module.exports = function (app) {
} catch (error) {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
op: "/api/ali/esp/intention/solution/feedback",
op: "/api/ali/tm/feedback/submit",
content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
app.use('/api/alitest/ic/paySuccess', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
req.body.action_type = "paySuccess";
var result = await utilsNeedSve.paySuccess(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
op: "/api/ali/ic/paySuccess",
content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
res.end(JSON.stringify(result));
return JSON.stringify(result);
} catch (error) {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
op: "/api/ali/ic/paySuccess",
content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
app.use('/api/alitest/ic/close', async function (req, res) {
app.use('/api/ali/tm/status/notify', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
console.log(req.headers['content-type'])
if (req.headers['content-type'].indexOf('application/octet-stream') > -1) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
req.body.action_type = "orderClose";
var result = await utilsNeedSve.orderClose(req.body, client_ip);
req.body.action_type = "icpNotify";
var result = await gatewaypushlogSve.icpNotify(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
op: "/api/ali/ic/close",
op: "api/ali/tm/status/notify",
content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
......@@ -233,39 +342,14 @@ module.exports = function (app) {
} catch (error) {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
op: "/api/ali/ic/close",
op: "/api/ali/tm/status/notify",
content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
app.use('/api/alitest/esp/intention/close', async function (req, res) {
try {
if (req.headers['content-type'].indexOf('application/octet-stream')>-1 ) {
await logCtl.applicationOctetStream2Json(req);
}
var client_ip = system.get_client_ip(req);
req.body.action_type = "needClose";
var result = await utilsNeedSve.reqcenterchannel(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,
op: "/api/ali/esp/intention/close",
content: "回调参数：" + JSON.stringify(req.body) + "回调处理订单结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
res.end(JSON.stringify(result));
return JSON.stringify(result);
} catch (error) {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录回调处理结果异常：，method=" + req.body.trxcode,
op: "/api/ali/esp/intention/close",
content: "回调参数：" + JSON.stringify(req.body) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
app.get('/api/:gname/:qname/:method', function (req, res) {
var classPath = req.params["qname"];
var methodName = req.params["method"];
......
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