gq %!s(int64=8) %!d(string=hai) anos
pai
achega
0bf37daa2a

+ 33 - 40
server/app/Http/Controllers/Api/V1/HomeController.php

xqd xqd xqd
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Models\BaseDictionaryOptionModel;
 use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
 use App\Models\DreamInfoModel;
+use App\Models\SupportDreamModel;
 use App\Models\SystemInfoModel;
 use App\Models\UserCareUser;
 use App\Models\UserDream;
@@ -22,33 +24,19 @@ class HomeController extends Controller
      * @apiParam {int} user_id 用户ID
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
-     * {
-     *  "nickname": "",  名字
-     *  "pic": "",   头像
-     *  "tall": "",  身高
-     *  "job": "",  职业
-     *  "emotion": "1",  情感
-     *  "address": "",地址
-     *  "score": 1000,  支持分
-     *  "care": 4,  关注
-     *  "fens": 3,   粉丝
-     *  "user_dream": [
-     *      "id": 3,
-     *      "dream": "3去旅游",
-     *      "about": "",
-     *      "money": 0,
-     *      "time": 0,
-     *      "get_money": 0,
-     *      "mark": 0,
-     *      "status": 0,
-     *      "pic": [],
-     *      "dream_imgs": []
-     *      "near_dream_pic": [
-     *          {
-     *              "pic": "234"
-     *          },
-     *    ]
+     *{
+     *   "status": true,
+     *   "status_code": 0,
+     *   "message": "",
+     *  "data": {
+     *      "user": {},             用户信息
+     *      "near_dream": {},       当前梦想
+     *      "sup_dreams": [],       支持的梦想
+     *      "all_imgs": [],         封面图片
+     *      "dreams": []            曾经的梦想
+     *      "score": 2000           支持分数
      *  }
+     *}
      * @apiErrorExample {json} Error-Response:
      *HTTP/1.1 400 Bad Request
      *{
@@ -61,39 +49,44 @@ class HomeController extends Controller
     public function index(Request $request)
     {
         $user_id = $request->user_id;
-        $care = UserCareUser::where('user_id',$user_id)->paginate(20);
-        $fens = UserCareUser::where('other_user_id',$user_id)->paginate(20);
+//        获得的支持分数
+        $info = SupportDreamModel::where('to_user_id',$user_id)->get();
+        $score = 0;
+        foreach ($info as $item) {
+            $score += $item->score;
+        }
+        $care = UserCareUser::where('user_id',$user_id)->get();
+        $fens = UserCareUser::where('other_user_id',$user_id)->get();
         $user = UserInfoModel::find($user_id);
-        if (count($user == 0)) return $this->error(ErrorCode::USER_DOES_NOT_EXIST);
-        $job = BaseSettingsModel::where(['category' => 'job'])->where(['key' => $user->job])->first();
-        $job = count($job) > 0 ? $job->value : '';
-        $emotion = BaseSettingsModel::where(['category' => 'emotion'])->where(['key' => $user->emotion])->first();
-        $emotion = count($emotion) > 0 ? $emotion->value : '';
+        if (count($user) == 0) return $this->error(ErrorCode::USER_DOES_NOT_EXIST);
+        $emotion = BaseDictionaryOptionModel::where(['dictionary_code' => 'emotion'])->
+            where('dictionary_table_code','user_info')->
+        where(['value' => $user->emotion])->first();
+        $emotion = count($emotion) > 0 ? $emotion->name : '';
 //        当前梦想
-        $near_dream_id = UserDream::where('user_id',$user_id)->orderBy('id','desc')->first()->dream_id;
-        $near_dream =DreamInfoModel::find($near_dream_id);
+        $near_dream =DreamInfoModel::where('user_id',$user->id)->orderBy('id','desc')->first();
 //         封面图片
-        $near_dream_pic = DreamImages::where('dream_id',$near_dream_id)->select('pic')->paginate(20);
+        $all_imgs =$user->allImgs;
 //        曾经的梦想
         $dreams = $user->UserDream;
 
         foreach ($dreams as $dream){
-            $dream->pic = $dream->dreamImgs;
+            $dream->dream_imgs = $dream->dreamImgs;
         }
 
         $user->score = 1000;//自定义 算法
         $user->care = count($care);
         $user->fens = count($fens);
-        $user->job = $job;
+        $user->dreams =$dreams;
         $user->emotion = $emotion;
 //         支持的梦想
         $sup_dreams = $user->supDream;
 
         foreach ($sup_dreams as $sup_dream){
-            $sup_dream->pic = $sup_dream->dreamImgs;
+            $sup_dream->pics = $sup_dream->dreamImgs;
         }
 
-        return $this->api(compact('user','near_dream','sup_dreams','near_dream_pic'));
+        return $this->api(compact('user','near_dream','sup_dreams','all_imgs','dreams','score'));
 
     }
 

+ 17 - 0
server/app/Models/SupportDreamModel.php

xqd
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupportDreamModel extends Model
+{
+    protected $table = 'support_dream';
+    protected $fillable = [
+        'user_id',
+        'dream_id',
+        'to_user_id',
+        'coin',
+        'score',
+    ];
+}

+ 7 - 2
server/app/Models/UserInfoModel.php

xqd xqd
@@ -67,12 +67,12 @@ class UserInfoModel extends Authenticatable
 //用户梦想
     public function UserDream()
     {
-        return $this->belongsToMany('App\Models\DreamInfoModel','user_dream','user_id','dream_id');
+        return $this->hasMany('App\Models\DreamInfoModel','user_id','id');
     }
 //支持的梦想
     public function supDream()
     {
-        return $this->belongsToMany('App\Models\DreamInfoModel','system_info','user_id','other_id');
+        return $this->belongsToMany('App\Models\DreamInfoModel','support_dream','user_id','dream_id');
     }
 //评论的梦想
     public function comDream()
@@ -105,5 +105,10 @@ class UserInfoModel extends Authenticatable
     {
         return $this->hasMany('App\Models\SearchInfoModel','user_id','id');
     }
+//    获取所有梦想的图片
+    public function allImgs()
+    {
+        return $this->hasManyThrough('App\Models\DreamImages', 'App\Models\DreamInfoModel','user_id','dream_id');
+    }
 
 }

+ 2 - 1
server/database/migrations/2017_06_22_083956_create_support_dream_info_table.php

xqd
@@ -16,7 +16,8 @@ class CreateSupportDreamInfoTable extends Migration
         Schema::create('support_dream', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id')->comment('当前用户ID');
-            $table->integer('dram_id')->comment('梦想ID');
+            $table->integer('dream_id')->comment('梦想ID');
+            $table->integer('to_user_id')->comment('梦想所有者ID');
             $table->integer('coin')->comment('充值梦想币数量');
             $table->integer('score')->comment('支持分数');
             $table->timestamps();