فهرست منبع

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

lh 3 سال پیش
والد
کامیت
e0e4523f30

+ 1 - 1
src/Controllers/CompanyAuth/AppController.php

@@ -104,7 +104,7 @@ class AppController extends Controller
      */
     public function channels(ChannelQueryRequest $request)
     {
-        $is_enabled = $request->get('is_enabled');
+        $is_enabled = $request->get('is_enabled', '');
         $service = new ChannelService;
         $channels = $service->getChannelsByChannelUserIds($this->channel_user_ids, $is_enabled);
         $result = collectionTransform(new ChannelTransformer, $channels);

+ 2 - 0
src/Requests/CompanyAuth/ChannelQueryRequest.php

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

+ 1 - 1
src/Services/Channel/ChannelService.php

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