'渠道列表增加状态筛选'

src/Controllers/CompanyAuth/AppController.php

@@ -155,6 +155,7 @@ class AppController extends Controller
      * @apiName orders
      * @apiGroup CompanyAuth
      * @apiParam {String} channel_id 站点id
+     * @apiParam {String} status 支付状态 PAID：已支付, UNPAID: 未支付
      * @apiParam {String} begin_date 开始时间（时间区间小于60天，格式yyyy-MM-dd HH:mm:ss）
      * @apiParam {String} end_date 截止时间（时间区间小于60天，格式yyyy-MM-dd HH:mm:ss）
      * @apiParam {Int} page 分页页码
@@ -228,13 +229,14 @@ class AppController extends Controller
     public function orders(ChannelQueryRequest $request)
     {
         $channel_id = $request->get('channel_id');
+        $status = $request->get('status');
         $begin_date = $request->get('begin_date', date('Y-m-d', strtotime('-7 days')));
         $end_date = $request->get('end_date', date('Y-m-d', strtotime('+1 days')));
         if (strtotime($end_date) - strtotime($begin_date) > SysConsts::ONE_DAY_SECONDS * 60) {
             return response()->error('COMPANY_AUTH_OVER_TIME');
         } else {
             $service = new OrderService;
-            $result = $service->companyAuthOrders(compact('channel_id', 'begin_date', 'end_date'));
+            $result = $service->companyAuthOrders(compact('channel_id', 'status', 'begin_date', 'end_date'));
             return response()->pagination(new OrderTransformer, $result);
         }
     }

src/Requests/CompanyAuth/ChannelQueryRequest.php

@@ -23,6 +23,7 @@ class ChannelQueryRequest extends Request
             'begin_date' => 'date',
             'end_date' => 'required_with:begin_date|date|after_or_equal:begin_date',
             'uid' => 'string',
+            'status' => 'in:PAID,UNPAID'
         ];
     }
 

src/Services/Channel/ChannelService.php

@@ -13,9 +13,8 @@ use General\Models\Channel\Channel;
 
 class ChannelService
 {
-    public function getChannelsByChannelUserIds(array $channel_user_ids, $is_enabled = '')
+    public function getChannelsByChannelUserIds(array $channel_user_ids)
     {
-        if ($is_enabled == '') return Channel::whereIn('channel_user_id', $channel_user_ids)->whereIn('is_enabled', $is_enabled)->get();
         return Channel::whereIn('channel_user_id', $channel_user_ids)->get();
     }
 }

src/Services/Order/OrderService.php

@@ -23,6 +23,7 @@ class OrderService
             ->where('created_at', '>=', $params['begin_date'])
             ->where('created_at', '<=', $params['end_date'])
             ->where('distribution_channel_id', $params['channel_id'])
+            ->where('status', $params['status'])
             ->orderBy('id', 'desc')
             ->paginate(100);
     }