Merge branch 'liuzj-1000990-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -33,6 +33,7 @@ class PromotionController extends CatchController
         $miniprogramId = $request->input('miniprogram_id');
         $result = DB::table('promotions')
             ->leftJoin('videos', 'videos.id', '=', 'promotions.video_id')
+            ->leftJoin('miniprogram', 'miniprogram.id', '=', 'promotions.miniprogram_id')
             ->where(['promotions.is_enabled' => 1, 'promotions.uid' => $this->getLoginUserId()])
             ->when($miniprogramId, function ($query, $miniprogramId) {
                 return $query->where('promotions.miniprogram_id', $miniprogramId);
@@ -54,7 +55,7 @@ class PromotionController extends CatchController
             })->orderBy('created_at', 'desc')
             ->select('promotions.id', 'promotions.name', 'promotions.created_at',
                 'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
-                'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status')
+                'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status', 'miniprogram.name as miniprogram_name')
             ->paginate($request->input('limit', 15));
         foreach ($result as $item) {
             $item->status_str = $item->status ? '启用':'禁用';

modules/Video/Http/Controllers/VideoController.php

@@ -29,6 +29,9 @@ class VideoController extends CatchController
         $videoId = $request->input('videoId');
         $shelfType = $request->input('shelfType');
         $wechatPass = $request->input('wechatPass');
+        if($this->listUserRoles()->intersect(['company', 'optimizer'])->isNotEmpty()) {
+            $shelfType = 2;
+        }
 
         $videos = DB::table('videos')
             ->when($videoId, function ($query, $videoId){

tests/UsedTestCase.php

@@ -13,11 +13,11 @@ abstract class UsedTestCase extends BaseTestCase
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $tokenInfo = $this->post('http://localhost/api/login', [
-            'email' => 'catch@admin.com',
+//            'email' => 'catch@admin.com',
             'remember' => false,
 //            'email' => 'xiaoli@qq.com',
             'password' => 'catchadmin',
-//            'email' => 'aa4@test.com',
+            'email' => 'aa4@test.com',
         ])->json();
         $this->token = $tokenInfo['data']['token'];
     }