Skip to content

Z
zhichan
Commit bae63d6f by 宋毅
Options

tj

parent 7b243c25
Showing with 68 additions and 68 deletions
brg-user-center/app/base/api/api.base.js
......@@ -130,7 +130,7 @@ class APIBase {
if (!result) {
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 };
this.execClient.execLogs("reqPath:" + req.path + "执行结果", reqParams, "brg-user-center-doexecMethod", tmpResult, null);
if (pobj.Action && action) {
......@@ -145,7 +145,7 @@ class APIBase {
var stackStr = error.stack ? error.stack : JSON.stringify(error);
console.log(stackStr, "api调用出现异常，请联系管理员..........")
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);
if (pobj.Action && action) {
return {
......@@ -281,15 +281,15 @@ class APIBase {
if (!result) {
result = system.getResult(null, "请求的方法返回值为空");
}
result.requestId = pobj.RequestId || uuid.v1();
this.execClient.execLogs("reqPath:" + req.path + "brg请求结果", param, "brg-user-center-brgDoexecMethod", result, null);
result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
this.execClient.execLogs("brg请求reqPath:" + req.path + "brg请求结果", param, "brg-user-center-brgDoexecMethod", result, null);
return result;
} catch (error) {
var stackStr = error.stack ? error.stack : JSON.stringify(error);
console.log(stackStr, "api-brg请求调用出现异常，请联系管理员..........");
var rtnerror = system.getResultTX(-1, "", "brg请求出现异常，error：" + stackStr, null);
rtnerror.requestId = pobj.RequestId || uuid.v1();
this.execClient.execLogs("reqPath:" + req.path + "brg请求出现异常", param, "brg-user-center-brgDoexecMethod", null, stackStr);
rtnerror.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || uuid.v1();
this.execClient.execLogs("brg请求出现异常reqPath:" + req.path, param, "brg-user-center-brgDoexecMethod", null, stackStr);
return rtnerror;
}
}
......
brg-user-center/app/base/api/impl/action/order.js
......@@ -93,7 +93,7 @@ class Order extends APIBase {
case "refundOrder"://退款接口
opResult = await this.orderinfoSve.refundOrder(pobj.actionBody, req);
if(opResult.status>0){
await self.orderDeliverySve.sendNotification(pobj.actionBody.orderNum,320);
await self.orderdeliverySve.sendNotification(pobj.actionBody.orderNum,320);
}
break;
case "jftime"://计费时间修改
......
brg-user-center/app/base/service/impl/common/txPushLogSve.js
......@@ -78,7 +78,7 @@ class TxPushLogService extends ServiceBase {
if (!loginfo) {
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) {
return self.returnTX(-1, "cgateway", "资源不存在", null)
}
......
brg-user-center/package.json
{
"name": "bigdata",
"version": "1.0.0",
"description": "h5framework",
"main": "main.js",
"scripts": {
"dev": "nodemon main.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"license": "ISC",
"dependencies": {
"@alicloud/pop-core": "^1.7.7",
"MD5": "^1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"aliyun-api-gateway": "^1.1.6",
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"base64id": "^1.0.0",
"bluebird": "^3.5.1",
"body-parser": "^1.18.2",
"co": "^4.6.0",
"connect-redis": "^3.3.3",
"continuation-local-storage": "^3.2.1",
"cookie-parser": "^1.4.3",
"crypto": "^1.0.1",
"crypto-js": "^3.1.9-1",
"ejs": "^2.5.8",
"element-ui": "^2.4.0",
"engine.io-parser": "^2.1.2",
"errorhandler": "^1.5.0",
"exif-js": "^2.3.0",
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"marked": "^0.7.0",
"method-override": "^2.3.10",
"morgan": "^1.9.0",
"multer": "^1.3.0",
"mysql2": "^1.5.3",
"node-cron": "^2.0.1",
"node-uuid": "^1.4.8",
"node-xlsx": "^0.15.0",
"nodemailer": "^6.3.0",
"pinyin": "^2.9.0",
"puppeteer": "^1.20.0",
"qr-image": "^3.2.0",
"sequelize": "^4.37.8",
"sequelize-cli": "^4.1.1",
"serve-favicon": "^2.4.5",
"sha1": "^1.1.1",
"sha256": "^0.2.0",
"socket.io": "^2.1.1",
"uuid": "^3.4.0"
},
"devDependencies": {
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.0"
}
}
{
"name": "bigdata",
"version": "1.0.0",
"description": "h5framework",
"main": "main.js",
"scripts": {
"dev": "nodemon main.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"license": "ISC",
"dependencies": {
"@alicloud/pop-core": "^1.7.7",
"MD5": "^1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"aliyun-api-gateway": "^1.1.6",
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"base64id": "^1.0.0",
"bluebird": "^3.5.1",
"body-parser": "^1.18.2",
"co": "^4.6.0",
"connect-redis": "^3.3.3",
"continuation-local-storage": "^3.2.1",
"cookie-parser": "^1.4.3",
"crypto": "^1.0.1",
"crypto-js": "^3.1.9-1",
"ejs": "^2.5.8",
"element-ui": "^2.4.0",
"engine.io-parser": "^2.1.2",
"errorhandler": "^1.5.0",
"exif-js": "^2.3.0",
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"marked": "^0.7.0",
"method-override": "^2.3.10",
"morgan": "^1.9.0",
"multer": "^1.3.0",
"mysql2": "^1.5.3",
"node-cron": "^2.0.1",
"node-uuid": "^1.4.8",
"node-xlsx": "^0.15.0",
"nodemailer": "^6.3.0",
"pinyin": "^2.9.0",
"puppeteer": "^1.20.0",
"qr-image": "^3.2.0",
"sequelize": "^4.37.8",
"sequelize-cli": "^4.1.1",
"serve-favicon": "^2.4.5",
"sha1": "^1.1.1",
"sha256": "^0.2.0",
"socket.io": "^2.1.1",
"uuid": "^3.4.0"
},
"devDependencies": {
"element-theme": "^2.0.1",
"element-theme-chalk": "^2.4.0"
}
}
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