Merge branch 'xgg-admin-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin-dev

xgg-admin/app/base/controller/impl/order/orderCtl.js

@@ -241,6 +241,19 @@ class OrderCtl extends CtlBase {
       return system.getResult(null,`系统错误 错误信息 ${error}`);
     }
   }
+  /**
+   * 订单列表
+   * @param {*} pobj 
+   * @param {*} pobj2 
+   * @param {*} req 
+   */
+  async orders(pobj, pobj2, req){
+    try {
+      return await this.orderSve.orders(pobj);
+    } catch (error) {
+      return system.getResult(null,`系统错误 错误信息 ${error}`);
+    }
+  }
 
 
   // async orderList(pobj, pobj2, req) {

xgg-admin/app/base/service/impl/order/orderSve.js

@@ -374,5 +374,19 @@ class OrderService extends ServiceBase {
       return system.getResult(null,`系统错误 错误信息 ${error}`);
     }
   }
+
+  /**
+   * 订单列表
+   * @param {*} pobj 
+   * @param {*} pobj2 
+   * @param {*} req 
+   */
+  async orders(pobj, pobj2, req){
+    try {
+      return await this.callms("order", "orders", pobj);
+    } catch (error) {
+      return system.getResult(null,`系统错误 错误信息 ${error}`);
+    }
+  }
 }
 module.exports = OrderService;
\ No newline at end of file

xgg-admin/app/front/entry/public/apidoc/order/order.md

@@ -9,7 +9,7 @@
 
 1. [创建订单（企服通）](#createOrder)
 1. [完善信息](#completedOrder)
-
+1. [订单列表](#orders)
 ## **<a name="orderList"> 全部订单 </a>**
 [返回到目录](#menu)
 ##### URL
@@ -446,4 +446,57 @@
     "data": null,
     "requestid": "c179a24ec402454aa0e74c4333cc6eab"
 }
+```
+
+## **<a name="orders"> 订单列表 </a>**
+[返回到目录](#menu)
+##### URL
+[/web/order/orderCtl/orders]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+	    "currentPage": "1",                  //页码     非必填
+	    "pageSize": "10",                    //记录条数  非必填 
+	    "id": "1",                           //发票ID   非必填
+		"productType":"1010"                 //商品类型  必填  "1000" 注册订单  "1010" 代开订单  "1030"  代账订单 "1040" 增值服务
+	}
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": {
+        "count": 1,
+        "rows": [
+            {
+                "id": "13699868075000706",
+                "merchant_id": null,
+                "businessmen_id": null,
+                "orderpay_id": null,
+                "price": 50000,
+                "status": "1000",
+                "notes": "by myself",
+                "orderDeliverId": "",
+                "legalName": "president_nan",
+                "legalMobile": "18833836395",
+                "names": "driver baby",
+                "creditCode": "XXEIGIGKTI8989",
+                "isBank": 0,
+                "businessScope": "crateTanke",
+                "isInfoComplete": 1,
+                "created_at": "2019-12-09 02:03:49",
+                "updated_at": "2019-12-09T03:42:40.000Z",
+                "deleted_at": null,
+                "version": 0,
+                "statusName": ""
+            }
+        ]
+    },
+    "requestid": "e940f89920b4427f93ddbe9c2ff06856"
+}
 ```
\ No newline at end of file