diff --git a/app/admin/route/app.php b/app/admin/route/app.php index c956ee62..b47b0039 100644 --- a/app/admin/route/app.php +++ b/app/admin/route/app.php @@ -14,7 +14,7 @@ $header = [ //Route::get('/test', 'Test/index'); Route::post('/test', 'Test/index'); Route::post('/test_upload', 'Upload/uploadVideo'); -Route::post('test_api', 'setting.StockIndex/inrStockIndexList'); +Route::post('test_api', 'video/addVideoOnDemand'); Route::group('/', function () { // 上传图片 Route::post('/upload', 'Upload/upload'); diff --git a/app/admin/service/AgentService.php b/app/admin/service/AgentService.php index 989e14e3..4ef1a640 100644 --- a/app/admin/service/AgentService.php +++ b/app/admin/service/AgentService.php @@ -250,7 +250,7 @@ class AgentService extends AdminBaseService public function changeUserCustomer($param) { try { - if (empty($param['user_id']) || empty($param['old_customer_id']) || empty($param['new_customer_id'])) { + if (empty($param['user_id']) || empty($param['new_customer_id'])) { return $this->toData('400', '参数错误'); } diff --git a/app/admin/service/VideoService.php b/app/admin/service/VideoService.php index 716fe115..88433581 100644 --- a/app/admin/service/VideoService.php +++ b/app/admin/service/VideoService.php @@ -38,20 +38,17 @@ class VideoService extends AdminBaseService public function addVideoOnDemand($param) { try { - if (empty($param['title']) || empty($param['cover_id']) || empty($param['video_id']) || empty($param['cover_url']) || empty($param['video_url'] || empty($param['state'])) ) { + if (empty($param['title']) || empty($param['cover_url']) || empty($param['state']) || empty($param['video_collection'])) { return $this->toData('400', '参错错误'); } $insert = VideoOnDemandModel::create([ 'title' => $param['title'], 'desc' => $param['desc'] ?? "", - 'cover_id' => $param['cover_id'], - 'video_id' => $param['video_id'], - 'banner_id' => $param['banner_id'], 'cover_url' => $param['cover_url'], - 'video_url' => $param['video_url'], 'banner_url' => $param['banner_url'], 'sort' => $param['sort'] ?? 0, 'state' => $param['state'], + 'video_collection' => $param['video_collection'] ]); return $this->toData('0', 'SUCCESS', ['insert_id' => $insert->id]); } catch (\Exception $exception) { @@ -66,7 +63,7 @@ class VideoService extends AdminBaseService if (empty($param['id'])) { return $this->toData('400', 'Missing param id'); } - if (empty($param['title']) || empty($param['cover_id']) || empty($param['video_id']) || empty($param['cover_url']) || empty($param['video_url'] || empty($param['state'])) ) { + if (empty($param['title']) || empty($param['cover_url']) || empty($param['state']) || empty($param['video_collection'])) { return $this->toData('400', '参错错误'); } $ckInfo = VideoOnDemandModel::where('id', $param['id'])->find(); @@ -75,14 +72,12 @@ class VideoService extends AdminBaseService } $ckInfo->title = $param['title']; $ckInfo->desc = $param['desc']; - $ckInfo->cover_id = $param['cover_id']; - $ckInfo->video_id = $param['video_id']; - $ckInfo->banner_id = $param['banner_id']; $ckInfo->cover_url = $param['cover_url']; $ckInfo->video_url = $param['video_url']; $ckInfo->banner_url = $param['banner_url']; $ckInfo->sort = $param['sort']; $ckInfo->state = $param['state']; + $ckInfo->video_collection = $param['video_collection']; $ckInfo->save(); return $this->toData('0', 'success'); } catch (\Exception $exception) { diff --git a/app/admin/validate/AdminValidate.php b/app/admin/validate/AdminValidate.php index 195ef690..cbec30fc 100644 --- a/app/admin/validate/AdminValidate.php +++ b/app/admin/validate/AdminValidate.php @@ -31,7 +31,7 @@ class AdminValidate extends AdminBaseValidate protected $scene = [ - 'addUser' => ['user_name','password','nick_name'], + 'addUser' => ['user_name','password','nick_name', 'parent_id'], 'updateInfo' => ['nick_name','email'], 'updateAccount' => ['user_name','nick_name'], 'updatePassword'=>['new_password','old_password'], diff --git a/app/model/VideoOnDemandModel.php b/app/model/VideoOnDemandModel.php index 9431817e..3fb48788 100644 --- a/app/model/VideoOnDemandModel.php +++ b/app/model/VideoOnDemandModel.php @@ -3,4 +3,9 @@ namespace app\model; class VideoOnDemandModel extends BaseModel { protected $name = 'video_on_demand'; + + // 定义字段类型自动转换 + protected $type = [ + 'video_collection' => 'json', // 存储视频合集,格式 [{"subtitle":"", "video_url":""},{}] + ]; } \ No newline at end of file