Skip to content

Z
zhichan
Commit bae63d6f by 宋毅
Options

tj

parent 7b243c25
Showing with 8 additions and 8 deletions
brg-user-center/app/base/api/api.base.js
...@@ -130,7 +130,7 @@ class APIBase { ...@@ -130,7 +130,7 @@ class APIBase {
if (!result) { if (!result) {
result = system.getResult(null, "请求的方法返回值为空"); result = system.getResult(null, "请求的方法返回值为空");
} }
result.requestId = pobj.RequestId || uuid.v1(); result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
var tmpResult = reqParams.actionType && reqParams.actionType.indexOf("List") < 0 ? result : { status: result.status, message: result.message, requestId: result.requestId }; var tmpResult = reqParams.actionType && reqParams.actionType.indexOf("List") < 0 ? result : { status: result.status, message: result.message, requestId: result.requestId };
this.execClient.execLogs("reqPath:" + req.path + "执行结果", reqParams, "brg-user-center-doexecMethod", tmpResult, null); this.execClient.execLogs("reqPath:" + req.path + "执行结果", reqParams, "brg-user-center-doexecMethod", tmpResult, null);
if (pobj.Action && action) { if (pobj.Action && action) {
...@@ -145,7 +145,7 @@ class APIBase { ...@@ -145,7 +145,7 @@ class APIBase {
var stackStr = error.stack ? error.stack : JSON.stringify(error); var stackStr = error.stack ? error.stack : JSON.stringify(error);
console.log(stackStr, "api调用出现异常，请联系管理员..........") console.log(stackStr, "api调用出现异常，请联系管理员..........")
var rtnerror = system.getResultFail(-200, "系统出现异常"); var rtnerror = system.getResultFail(-200, "系统出现异常");
rtnerror.requestId = pobj.RequestId || uuid.v1(); rtnerror.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
this.execClient.execLogs("reqPath:" + req.path + "执行异常", reqParams, "brg-user-center-doexecMethod", rtnerror, stackStr); this.execClient.execLogs("reqPath:" + req.path + "执行异常", reqParams, "brg-user-center-doexecMethod", rtnerror, stackStr);
if (pobj.Action && action) { if (pobj.Action && action) {
return { return {
...@@ -281,15 +281,15 @@ class APIBase { ...@@ -281,15 +281,15 @@ class APIBase {
if (!result) { if (!result) {
result = system.getResult(null, "请求的方法返回值为空"); result = system.getResult(null, "请求的方法返回值为空");
} }
result.requestId = pobj.RequestId || uuid.v1(); result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
this.execClient.execLogs("reqPath:" + req.path + "brg请求结果", param, "brg-user-center-brgDoexecMethod", result, null); this.execClient.execLogs("brg请求reqPath:" + req.path + "brg请求结果", param, "brg-user-center-brgDoexecMethod", result, null);
return result; return result;
} catch (error) { } catch (error) {
var stackStr = error.stack ? error.stack : JSON.stringify(error); var stackStr = error.stack ? error.stack : JSON.stringify(error);
console.log(stackStr, "api-brg请求调用出现异常，请联系管理员.........."); console.log(stackStr, "api-brg请求调用出现异常，请联系管理员..........");
var rtnerror = system.getResultTX(-1, "", "brg请求出现异常，error：" + stackStr, null); var rtnerror = system.getResultTX(-1, "", "brg请求出现异常，error：" + stackStr, null);
rtnerror.requestId = pobj.RequestId || uuid.v1(); rtnerror.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
this.execClient.execLogs("reqPath:" + req.path + "brg请求出现异常", param, "brg-user-center-brgDoexecMethod", null, stackStr); this.execClient.execLogs("brg请求出现异常reqPath:" + req.path, param, "brg-user-center-brgDoexecMethod", null, stackStr);
return rtnerror; return rtnerror;
} }
} }
......
brg-user-center/app/base/api/impl/action/order.js
...@@ -93,7 +93,7 @@ class Order extends APIBase { ...@@ -93,7 +93,7 @@ class Order extends APIBase {
case "refundOrder"://退款接口 case "refundOrder"://退款接口
opResult = await this.orderinfoSve.refundOrder(pobj.actionBody, req); opResult = await this.orderinfoSve.refundOrder(pobj.actionBody, req);
if(opResult.status>0){ if(opResult.status>0){
await self.orderDeliverySve.sendNotification(pobj.actionBody.orderNum,320); await self.orderdeliverySve.sendNotification(pobj.actionBody.orderNum,320);
} }
break; break;
case "jftime"://计费时间修改 case "jftime"://计费时间修改
......
brg-user-center/app/base/service/impl/common/txPushLogSve.js
...@@ -78,7 +78,7 @@ class TxPushLogService extends ServiceBase { ...@@ -78,7 +78,7 @@ class TxPushLogService extends ServiceBase {
if (!loginfo) { if (!loginfo) {
return self.returnTX(-1, "cgateway", "产品不存在", null) return self.returnTX(-1, "cgateway", "产品不存在", null)
} }
var orderInfo = await this.orderInfoDao.findOne({ order_num: loginfo.dataValues.dealName }); var orderInfo = await this.orderInfoDao.findOne({ order_num: loginfo.dataValues.deal_name });
if (!orderInfo) { if (!orderInfo) {
return self.returnTX(-1, "cgateway", "资源不存在", null) return self.returnTX(-1, "cgateway", "资源不存在", null)
} }
......
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