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

server/app/Console/Commands/DreamDJS.php

@@ -55,9 +55,12 @@ class DreamDJS extends Command
                 $dream_user = $item->user;
                 if (!empty($dream_user)) {
                     $message = "你的梦想《".$item->name."》已结束，点击了解接下来的步骤";
+                    $info = $dream_user->nickname.'会以你提供的微信／电话联系你约好时间地点亲自感谢你给予的支持和鼓励。如果你不希望见面或
+                            不想要梦想者拥有你的联系方式，请按《不需要见面》的按钮或联系客服。';
                     $arr = [
                         'user_id'=>0,
                         'message'=>$message,
+                        'info'=>$info,
                         'to_user_id'=>$item->user_id,
                         'dream_id'=>$item->id,
                         'is_end'=>1,

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

@@ -113,15 +113,10 @@ class AuthController extends Controller
         }else{
             $phone_user = UserInfoModel::where('phone',$phone)->first();
             if(!empty($phone_user)){
-                return $this->error(ErrorCode::USER_DOES_EXIST);
-//                if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
-//                    $user = Auth::user();
-//                    \Log::info($user);
-//                    $token = $user->createToken($user->phone)->accessToken;
-//                    return $this->api(compact( 'user', 'code','token'));
-//                }else{
-//                    return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
-//                }
+//                return $this->error(ErrorCode::USER_DOES_EXIST);
+                $user = $phone_user;
+                $token = $user->createToken($user->phone)->accessToken;
+                return $this->api(compact( 'user', 'code','token'));
             }
         }
         if (empty($user)) {

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

@@ -222,11 +222,11 @@ class DreamController extends Controller
         }
         arsort($top);
         foreach ($top as $user_id => $score){
-            $user = UserInfoModel::find($user_id);
-            if (!empty($user)) {
-                $user->score = $score;
-                $topuser[] = $user;
-                if(count($top3user) <= 2) $top3user[] = $user ;
+            $user1 = UserInfoModel::find($user_id);
+            if (!empty($user1)) {
+                $user1->score = $score;
+                $topuser[] = $user1;
+                if(count($top3user) <= 2) $top3user[] = $user1 ;
             }
         }
         if ($type == 'paihang') return $this->api($topuser);
@@ -420,9 +420,9 @@ class DreamController extends Controller
             $top = [] ;
             foreach ($support_dream as $item) {
                 if (!array_key_exists($item->user_id,$top)) {
-                    $top[$item->user_id] = $item->score;
+                    $top[$item->user_id] = $item->coin;
                 }else{
-                    $top[$item->user_id] += $item->score;
+                    $top[$item->user_id] += $item->coin;
                 }
             }
             arsort($top);
@@ -432,6 +432,8 @@ class DreamController extends Controller
             }else{
                 $old_top_user_id = 0;
             }
+        /*    dd($user->id);
+            dd($old_top_user_id);*/
 
 
 
@@ -440,10 +442,6 @@ class DreamController extends Controller
             $dream->get_coin += $coin;
             $dream->mark += $coin*$number;
             $dream->save();
-//            在支持梦想时 如果梦主排名配取代时发送系统消息
-            dd($old_top_user_id);
-            $this->systemInfo($dream->id,$user->id,$old_top_user_id);
-
 
             //            梦想实现创建二维码
             if ($dream->coin >= $dream->get_coin && empty($dream->code)) {
@@ -475,6 +473,8 @@ class DreamController extends Controller
                 'score'=>$coin*$number,
             ];
             $ok =   SupportDreamModel::create($data);
+            //            在支持梦想时 如果梦主排名配取代时发送系统消息
+            $this->systemInfo($dream_id,$user->id,$old_top_user_id);
             if (!$ok) {
                 return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
             }
@@ -501,7 +501,7 @@ class DreamController extends Controller
             SystemInfoModel::create($info);
 
 //            长连接
-            $this->jPush($message,'',$user_id);
+//            $this->jPush($message,'',$user_id);
 
 //            支持成功返回数据到当前页面   top3user
             $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
@@ -531,14 +531,14 @@ class DreamController extends Controller
     public function systemInfo($dream_id,$user_id,$old_top_user_id)
     {
         $user  = UserInfoModel::find($user_id);
-        $dream  = UserInfoModel::find($dream_id);
+        $dream  = DreamInfoModel::find($dream_id);
         $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
         $top = [] ;
         foreach ($support_dream as $item) {
             if (!array_key_exists($item->user_id,$top)) {
-                $top[$item->user_id] = $item->score;
+                $top[$item->user_id] = $item->coin;
             }else{
-                $top[$item->user_id] += $item->score;
+                $top[$item->user_id] += $item->coin;
             }
         }
         arsort($top);
@@ -548,11 +548,10 @@ class DreamController extends Controller
         }else{
             $top_user_id = $old_top_user_id;
         }
-        Log::info('-----------'.$top_user_id.'-----------'.$old_top_user_id.'-----------');
         if ($top_user_id != $old_top_user_id) {   //新的最大支持者不是以前的最大支持者时
             $arr = [
                 'user_id'=>0,
-                'message'=>"你已不是《$dream->name》的《梦主》啦！".$user->nickname."以$new_arr[0]分刚取代你的位置",
+                'message'=>"你已不是《".$dream->name."》的《梦主》啦！".$user->nickname."以$new_arr[0]分刚取代你的位置",
                 'to_user_id'=>$old_top_user_id,
                 'dream_id'=>$dream_id,
                 'is_url'=>1,
@@ -636,7 +635,7 @@ class DreamController extends Controller
                 'type_id' => 1,
                 'attr_id' => 2,
             ];
-            SystemInfoModel::firsrtOrCreate($info2);
+            SystemInfoModel::firstOrCreate($info2);
             //            长连接
             $this->jPush($message,'',$dream->user_id);
         }else{
@@ -800,6 +799,7 @@ class DreamController extends Controller
         }
         $data['created_at'] = date('Y-m-d H:i:s');
         $data['updated_at'] = date('Y-m-d H:i:s');
+        $data['status'] = 1;  //默认审核通过
         $dream_id = DreamInfoModel::insertGetId($data);
 
         if ($dream_id) {

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

@@ -717,6 +717,7 @@ class MyController extends Controller
                     "status": 127,
                     "video": "0",
                     "score": 0,
+                    "type_name": 已完成,
                     "sign": "158730",
                     "code": "http://www.miao.com/qrcodes/WECHATPAY_201708191324294255.png",
                     "parameter": 0,
@@ -745,6 +746,17 @@ class MyController extends Controller
     {
         $user = $this->getUser();
         $dreams = DreamInfoModel::where('user_id',$user->id)->orderBy('created_at','desc')->with('img')->paginate();
+        foreach ($dreams as $dream) {
+            if (strtotime($dream->end_time) > time()) {
+                $dream->type_name = '进行中';
+            }else{
+                if ($dream->get_coin >=$dream->coin) {
+                    $dream->type_name = '已完成';
+                }else{
+                    $dream->type_name = '未完成';
+                }
+            }
+        }
         return $this->api($dreams);
     }
 
@@ -1419,12 +1431,12 @@ class MyController extends Controller
                 'message'=>$message,
                 'to_user_id'=>$top_user,
                 'dream_id'=>$dream_id,
-                'is_end'=>1,
-                'type_id'=>1,
+                'attr_id'=>6,
+                'is_end'=>0,
+                'type_id'=>2,
                 'is_max'=>1,
-
             ];
-            SystemInfoModel::firstOrCreate($arr);
+          SystemInfoModel::firstOrCreate($arr);
         }
 
         return $this->api($top_user);
@@ -1480,9 +1492,11 @@ class MyController extends Controller
                 $arr = [
                     'user_id'=>0,
                     'message'=>$to_user_info->nickname.'会第一时间联系你！见面时需要你扫一扫他提供的二维码哦',
+//                    'info'=>$to_user_info->nickname.'会第一时间联系你！见面时需要你扫一扫他提供的二维码哦',
                     'to_user_id'=>$user->id,
                     'is_end'=>1,
-                    'type_id'=>1,
+                    'attr_id'=>6,
+                    'type_id'=>2,
                 ];
                 SystemInfoModel::firstOrCreate($arr);
             }
@@ -1495,9 +1509,11 @@ class MyController extends Controller
             'message'=>$message,
             'to_user_id'=>$to_user_id,
             'is_end'=>1,
+            'attr_id'=>5,
             'type_id'=>1,
         ];
         SystemInfoModel::firstOrCreate($arr);
+        return $this->api('');
     }
 
 }

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

@@ -67,16 +67,18 @@
                                                    
                    <p class="list-group-item-text"> {{ $data['status'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">梦想视频地址</h3>
-                                                   
-                   <p class="list-group-item-text">
-                       <video src="{{ $data['video'] or ''}}" controls="controls"></video>
-                   </p>
-                                                 
-               </div>                     
+               </div>
+            @if(!empty($data['video']))
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">梦想视频地址</h3>
+
+                    <p class="list-group-item-text">
+                        <video src="{{ $data['video'] or ''}}" controls="controls"></video>
+                    </p>
+
+                </div>
+            @endif
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">梦想排行分数</h3>
@@ -93,25 +95,11 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading"></h3>
+                   <h3 class="list-group-item-heading">创建时间</h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
                                                  
                </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
-                                                 
-               </div>
         </div>
     </div>
 </div>

server/routes/api.php

@@ -146,6 +146,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.sure_meet',
         'uses' => 'MyController@isOk',
     ]);
+    $api->get('my/sure_meet2', [
+        'as' => 'my.sure_meet2',
+        'uses' => 'MyController@isOk2',
+    ]);
     $api->get('my/sup_info', [
         'as' => 'my.sup_info',
         'uses' => 'MyController@supInfo',