tj

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)
     }