Commit aa6e37de by 杨昕

sfd

parent 7ef91170
Pipeline #10753 passed with stages
in 40 seconds
...@@ -126,6 +126,7 @@ class MediaController extends Controller ...@@ -126,6 +126,7 @@ class MediaController extends Controller
'description' => '', 'description' => '',
'duration' => '', 'duration' => '',
'media_type' => '', 'media_type' => '',
'shop_id' => '',
])); ]));
$data_time = Carbon::now(); $data_time = Carbon::now();
...@@ -133,12 +134,19 @@ class MediaController extends Controller ...@@ -133,12 +134,19 @@ class MediaController extends Controller
$params = array( $params = array(
'media_id' => 'mda-'.generateRandomNum(16), 'media_id' => 'mda-'.generateRandomNum(16),
'media_type'=> '5efa9cb5d16f5a214671fd86',
'start_time'=> $data_time, 'start_time'=> $data_time,
'end_time' => $data_time, 'end_time' => $data_time,
'access_key'=> '', 'access_key'=> '',
'description'=>'', 'description'=>$request->description??'',
); );
if ($request->shop_id=='100'){
$params['media_type'] = "5f3d073a033f5a336b2b4346";
}
$request->replace(array_merge($request->all(),$params)); $request->replace(array_merge($request->all(),$params));
$id = MediaModel::hookRestoreMedia($request); $id = MediaModel::hookRestoreMedia($request);
......
...@@ -176,7 +176,10 @@ class MediaModel extends Eloquent ...@@ -176,7 +176,10 @@ class MediaModel extends Eloquent
$media_info = explode("&",$request->media_name); $media_info = explode("&",$request->media_name);
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first(); $media_type = $request->media_type;
$mediaCatg = MediaCategoryModel::where('_id',$media_type)->first();
if (empty($mediaCatg)){ if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在"); throw new \Exception("媒资类别不存在");
} }
...@@ -199,9 +202,9 @@ class MediaModel extends Eloquent ...@@ -199,9 +202,9 @@ class MediaModel extends Eloquent
if ($request->shop_id=='100'){ // if ($request->shop_id=='100'){
$mediaCatg = MediaCategoryModel::where('_id','5f3d073a033f5a336b2b4346')->first(); // $mediaCatg = MediaCategoryModel::where('_id','5f3d073a033f5a336b2b4346')->first();
} // }
/** /**
...@@ -708,4 +711,7 @@ class MediaModel extends Eloquent ...@@ -708,4 +711,7 @@ class MediaModel extends Eloquent
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment