Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -13,6 +13,7 @@ use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
 use App\Models\DreamInfoModel;
 use App\Models\SystemInfoModel;
+use App\Models\UserCareDream;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Dream\Criteria\MultiWhere;
@@ -126,6 +127,7 @@ class InfoController extends Controller
             $arr[] = $pic['pic'];
         }
         $data->imgs = $arr;
+        $data['sign'] = explode(',',$data['sign']);
         $signs = BaseSettingsModel::where('category','sign')->orderBy('id')->get();
         return view('admin.dream.info.edit',compact('data','signs'));
     }
@@ -135,6 +137,23 @@ class InfoController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        if (array_key_exists('sign',$data)) {
+            $data['sign'] = join(',',$data['sign']);
+        }
+//        后台修改排行参数时，梦想分数也改变
+        $dream_id = request('id');
+        $data2 = UserCareDream::where('dream_id',$dream_id)->get();
+        $care_num = count($data2);
+        $setting = BaseSettingsModel::where('category','paihang')->first();
+        $a = $data['parameter'];
+        $b = $setting?$setting->value:1;
+        $t = 21*3600 / 60;
+        \Log::debug($data['end_time'].' care_num:'.$care_num.' a:'.$a.' b:'.$b.' t:'.$t);
+        if ($care_num == 0) {
+            $data['score'] = (($a/$t) + $b)*100000000 ;
+        }else{
+            $data['score'] = (log($care_num) + ($a/$t) + $b)*100000000 ;
+        }
         $pics = (array) request('pic');
         if (empty($pics)) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -28,6 +28,7 @@ class DreamController extends Controller
      * @apiVersion 0.1.0
      * @apiParam {int} [type=home] home interaction paihang  默认all
      * @apiParam {int} id 梦想ID
+     * @apiParam  [dream_user_id] id 梦想者id
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
      *               主页
@@ -194,6 +195,10 @@ class DreamController extends Controller
     public function show(Request $request)
     {
         $user = $this->getUser();
+        if (!empty($request->input('dream_user_id'))) {
+//            查看梦想后 最新最新梦想为0
+            UserCareUser::where('user_id',$user->id)->where('other_user_id',$request->input('dream_user_id'))->update(['dream_id'=>0,'dream_number'=>0]);
+        }
         $type = $request->type;    //类型
         $id = $request->id;    //梦想ID
         $user_care_dream = UserCareDream::where('user_id',$user->id)->where('dream_id',$id)->first();

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -359,37 +359,37 @@ class IndexController extends Controller
                 switch ($value) {
                     case 1:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-21)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
+                            $select->whereYear('birthday','>=',(date('Y')-21))->whereYear('birthday','<=',(date('Y')-18));
                         });
                         break;
                     case 2:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-25)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-22)));
+                            $select->whereYear('birthday','>=',(date('Y')-25))->whereYear('birthday','<=',(date('Y')-22));
                         });
                         break;
                     case 3:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-29)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-26)));
+                            $select->whereYear('birthday','>=',(date('Y')-29))->whereYear('birthday','<=',(date('Y')-26));
                         });
                         break;
                     case 4:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-33)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-30)));
+                            $select->whereYear('birthday','>=',(date('Y')-33))->whereYear('birthday','<=',(date('Y')-30));
                         });
                         break;
                     case 5:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-37)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-34)));
+                            $select->whereYear('birthday','>=',(date('Y')-37))->whereYear('birthday','<=',(date('Y')-34));
                         });
                         break;
                     case 6:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-38)));
+                            $select->whereYear('birthday','<=',(date('Y')-38));
                         });
                         break;
                     case 7:
                         $query = $query->orWhereHas('user', function ($select) use ($age) {
-                            $select->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
+                            $select->whereYear('birthday','>=',(date('Y')-17));
                         });
                         break;
                 }

server/resources/views/admin/dream/info/edit.blade.php

@@ -153,11 +153,10 @@
                 <div class="form-group">
                                     
                  <label class="control-label col-sm-3">梦想标签</label>
-                                    
                    <div class="col-sm-9">
                        <select name="data[sign][]" id="data_sign" class="form-control" size=""  multiple="multiple">
-                           @foreach($signs as $sign)
-                               <option value="{{$sign->value}}" @if(isset($data['sign']) && $sign->value == $data['sign']) selected  @endif>{{$sign->value}}</option>
+                           @foreach($signs as $key =>$sign)
+                               <option value="{{$sign->value}}" @if(isset($data['sign']) && in_array($sign->value,$data['sign'])  ) selected  @endif>{{$sign->value}}</option>
                            @endforeach
                        </select>
                     </div>