Merge branch 'igirl-channel' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel

igirl-channel/app/base/api/impl/action/tmOrder.js

@@ -59,14 +59,18 @@ class TmOrderAPI extends APIBase {
         }
         }
         switch (action_type) {
         switch (action_type) {
             // sy
             // sy
+            case "clearAllCache":
+                await this.cacheManager["MagCache"].clearAll();
+                opResult = system.getResultSuccess(null, "清理缓存成功");
+                break;
             case "test"://测试
             case "test"://测试
                 opResult = system.getResultSuccess(null, "测试成功");
                 opResult = system.getResultSuccess(null, "测试成功");
                 break;
                 break;
             case "getOrderList"://获取订单列表(分页)
             case "getOrderList"://获取订单列表(分页)
-                opResult = await this.orderinfoSve.findAndCountAll(action_body,req);
+                opResult = await this.orderinfoSve.findAndCountAll(action_body, req);
                 break;
                 break;
             case "getOrderDetailByOrderNo"://获取订单详情
             case "getOrderDetailByOrderNo"://获取订单详情
-                opResult = await this.orderinfoSve.getOrderDetailByOrderNo(action_body,req);
+                opResult = await this.orderinfoSve.getOrderDetailByOrderNo(action_body, req);
                 break;
                 break;
             case "decryptStr"://
             case "decryptStr"://
                 opResult = await this.toolSve.decryptStr(req.app, action_body.opStr);
                 opResult = await this.toolSve.decryptStr(req.app, action_body.opStr);

igirl-channel/app/base/api/impl/action/tradetransfer.js

@@ -13,13 +13,13 @@ class TradetransferAPI extends APIBase {
 
 
   //订单创建
   //订单创建
   async createtransfer(p, obj, req) {
   async createtransfer(p, obj, req) {
-    
-    console.log(p.actionBody);
+
+    console.log(p.actionBody, "actionBody...............................");
     var orderinfo = await this.corderSve.createOrder(p.actionBody, req);
     var orderinfo = await this.corderSve.createOrder(p.actionBody, req);
-    console.log(orderinfo);
+    console.log(orderinfo, "orderinfo............................");
     if (orderinfo) {
     if (orderinfo) {
       if (orderinfo.status == "0") {
       if (orderinfo.status == "0") {
-        var result={
+        var result = {
           "errorCode": "OK",
           "errorCode": "OK",
           "errorMsg": "成功",
           "errorMsg": "成功",
           "module": { "orderId": orderinfo.data.orderNo },
           "module": { "orderId": orderinfo.data.orderNo },
@@ -28,7 +28,7 @@ class TradetransferAPI extends APIBase {
         }
         }
         return result;
         return result;
       } else if (orderinfo.status == "2") {
       } else if (orderinfo.status == "2") {
-        var result={
+        var result = {
           "errorCode": "OK",
           "errorCode": "OK",
           "errorMsg": "订单已存在",
           "errorMsg": "订单已存在",
           "module": { "orderId": orderinfo.data },
           "module": { "orderId": orderinfo.data },
@@ -36,10 +36,19 @@ class TradetransferAPI extends APIBase {
           "success": true
           "success": true
         }
         }
         return result;
         return result;
+      } else {
+        var result = {
+          "errorCode": "error",
+          "errorMsg": orderinfo.msg,
+          "module": { "orderId": "" },
+          "requestId": req.requestId,
+          "success": false
+        }
+        return result;
       }
       }
 
 
     } else {
     } else {
-      var result={
+      var result = {
         "errorCode": "error",
         "errorCode": "error",
         "errorMsg": "",
         "errorMsg": "",
         "module": { "orderId": "" },
         "module": { "orderId": "" },
@@ -82,7 +91,7 @@ class TradetransferAPI extends APIBase {
 
 
 
 
   //阿里网关
   //阿里网关
-  async aliclienttransfer(p,obj) {
+  async aliclienttransfer(p, obj) {
     if (p.actionBody) {
     if (p.actionBody) {
       var rtn = await this.aliclient.reqbyget(p.actionBody)
       var rtn = await this.aliclient.reqbyget(p.actionBody)
       return rtn;
       return rtn;