gq 7 years ago
parent
commit
ee56067888

+ 2 - 2
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -70,12 +70,12 @@ class AuthController extends Controller
         $validator = Validator::make($request->all(),
             [
                 'phone'         => 'required|regex:/^1[34578]\d{9}$/',
-//                'verify_code'      => 'required',
+                'verify_code'      => 'required',
             ],
             [
                 'phone.required'        => '请输入手机号码',
                 'phone.regex'           => '手机号码格式不正确',
-//                'verify_code.required'      => '短信验证码必填',
+                'verify_code.required'      => '短信验证码必填',
             ]
         );
 

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

xqd xqd xqd
@@ -11,6 +11,7 @@ use App\Models\SearchInfoModel;
 use App\Models\SupportDreamModel;
 use App\Models\SystemInfoModel;
 use App\Models\UserCareDream;
+use App\Models\UserCareUser;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
@@ -419,6 +420,32 @@ class DreamController extends Controller
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();
         }
+
+        //            并且同时会关注这个梦想者
+        $data = [
+            'user_id' =>$user->id,
+            'other_user_id' =>$request->id,
+        ];
+        $is_care = empty($request->is_care) ? 0 : $request->is_care;
+        $user_care_user = UserCareUser::where('user_id',$user->id)->
+        where('other_user_id',$dream->user_id)->first();
+        if ($is_care) {
+            if (empty($user_care_user)) {
+                UserCareUser::create($data);
+//                关注成功发送私信
+                $message = BaseSettingsModel::where('category','message')->first();
+                $message = empty($message) ? '' : $message->value;
+                $info = [
+                    'user_id'=>$request->id,
+                    'to_user_id' => $user->id,
+                    'message' =>$message
+                ];
+                SystemInfoModel::create($info);
+            }
+        }else{
+            UserCareUser::where('user_id',$user->id)->
+            where('other_user_id',$request->id)->delete();
+        }
         return $this->api($is_collection);
 
     }
@@ -597,7 +624,7 @@ class DreamController extends Controller
             $ids = UserCareDream::where('dream_user_id',$user->id)->select('user_id')->get()->toArray();
             $id_arrs = array_column($ids,'user_id');
             if (!empty($id_arrs)) {
-
+                $arr = [] ;
                 foreach ($id_arrs as $id){
                     $arr[] = [
                         'to_user_id' => $id,