gq před 7 roky
rodič
revize
939e6f0f7d

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

xqd xqd xqd
@@ -4,9 +4,11 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Models\BaseDictionaryOptionModel;
 
+use App\Models\BaseSettingsModel;
 use App\Models\DreamInfoModel;
 use App\Models\MeetInfoModel;
 use App\Models\SupportDreamModel;
+use App\Models\SystemInfoModel;
 use App\Models\UserCareUser;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
@@ -84,8 +86,10 @@ class HomeController extends Controller
         foreach ($sup_dreams as $sup_dream){
             $sup_dream->pics = $sup_dream->imgs;
         }
+        $is_care = UserCareUser::where('other_user_id',$user_id)->where('user_id',$user->id)->first();
+        $is_care = empty($is_care) ? 0 : 1 ;
 
-        return $this->api(compact('user','near_dream','sup_dreams','imgs','dreams','score'));
+        return $this->api(compact('user','near_dream','sup_dreams','imgs','dreams','score','is_care'));
 
     }
 
@@ -142,12 +146,21 @@ class HomeController extends Controller
             'user_id' =>$user->id,
             'other_user_id' =>$request->id,
         ];
-        $is_care = $request->is_care;
+        $is_care = empty($request->is_care) ? 0 : $request->is_care;
         $user_care_user = UserCareUser::where('user_id',$user->id)->
         where('other_user_id',$request->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)->

+ 32 - 0
server/database/migrations/2017_08_14_170315_add_to_user_id_to_system_info.php

xqd
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddToUserIdToSystemInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('system_info', function (Blueprint $table) {
+            $table->integer('to_user_id')->after('message')->nullable()->comment('私信对象id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('system_info', function (Blueprint $table) {
+            //
+        });
+    }
+}