Merge branch 'master' of 47.76.126.2:seven/bot-28

app/Http/Controllers/admin/PaymentOrder.php

@@ -17,6 +17,7 @@ class PaymentOrder extends Controller
      * @apiParam {int=0,1,2} type 类型 0全部 1=代收，2=代付
      * @apiParam {String} order_no 订单号
      * @apiPaaram {String} member_id 会员ID
+     * @apiParam {int=0,1,2,3} [status] 状态：0待处理 1处理中 2成功 3失败
      *
      */
     public function index()
@@ -27,6 +28,7 @@ class PaymentOrder extends Controller
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'type' => ['required', 'integer', 'in:0,1,2'],
                 'order_no' => ['nullable', 'string'],
+                'status' => ['nullable', 'integer', 'in:0,1,2,3'],
             ]);
 
 

app/Http/Controllers/api/Issue.php

@@ -32,7 +32,8 @@ class Issue extends BaseController
 
 
         $data = json_decode($data, true);
-        $data = array_reverse($data['data']);
+//        $data = array_reverse($data['data']);
+        $data = $data['data'];
         foreach ($data as &$item) {
             $item['keno'] = explode(',', $item['keno']);
             sort($item['keno']);