gq 7 лет назад
Родитель
Сommit
b889e9432d

+ 9 - 1
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd xqd
@@ -165,7 +165,7 @@ class InfoController extends Controller
         $data = (array) request('data');
         if ($data['status']==2) { //审核不过
             $info = [
-                'user_id' => $data['user_id'],
+                'to_user_id' => $data['user_id'],
                 'message' => ' 你的梦想被暂停,客服会在短时间内联络你',
                 'type_id' => 1,
                 'attr_id' => 5,
@@ -210,8 +210,16 @@ class InfoController extends Controller
             }
             if (!$file = VideoUpload::mvFile('file')) return back()->with('error','上传失败');
             $data["video"] = $file;
+        }else{
+//            更新是视频不存在则删除
+            $dream = $this->repository->find(request('id'));
+            $dream->video = '';
+            $dream->save();
+            dd($dream);
         }
+        dd(request("file"));
         if (!empty($pics)) {
+//            图片不为空
             $old_data_pics =  $this->repository->find(request('id'))->imgs->toArray();
             $old_pics = array_column($old_data_pics,'pic');
             $a = array_diff($pics['url'],$old_pics);

+ 4 - 1
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -627,17 +627,20 @@ class DreamController extends Controller
             $info2 = [
                 'to_user_id' => $dream->user_id,
                 'message' => $message,
+                'dream_id' => $request->id,
                 'user_id' => $user->id,
                 'is_reply' => 1,
                 'type_id' => 1,
                 'attr_id' => 2,
             ];
-            SystemInfoModel::create($info2);
+            SystemInfoModel::firsrtOrCreate($info2);
             //            长连接
             $this->jPush($message,'',$dream->user_id);
         }else{
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();
+//            取消收藏删除系统消息
+            SystemInfoModel::where('to_user_id',$dream->user_id)->where('dream_id',$request->id)->delete();
         }
 
         //            并且同时会关注这个梦想者

+ 1 - 1
server/app/Widget/Tools/VideoUpload.php

xqd
@@ -31,7 +31,7 @@ class VideoUpload
      *
      */
 
-    public static function mvFile($fileName, $sizex = 150, $sizey = 200,$isImage = false, $dir = 'order')//200 270
+    public static function mvFile($fileName, $sizex = 150, $sizey = 200,$isImage = false, $dir = 'dream/video')//200 270
     {
 
         if (!Request::hasFile($fileName)) return false;