gq 7 年之前
父节点
当前提交
0b7d0d5789

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

xqd xqd
@@ -154,7 +154,7 @@ class IndexController extends Controller
         $end_dream_info = DreamInfoModel::where('user_id',$id)->where('end_time','>',date('Y-m-d H:i:s'))->get();
         if (count($end_dream_info)>0) {
             foreach ($end_dream_info as $item){
-                $message = "你的梦想《".$item->title."》已结束,点击了解接下来的步骤";
+                $message = "你的梦想《".$item->name."》已结束,点击了解接下来的步骤";
                 $arr = [
                     'user_id'=>0,
                     'message'=>$message,
@@ -182,7 +182,7 @@ class IndexController extends Controller
                     $message = $item->name."已经结束啦!谢谢你的支持,你可是他的第".($key+1)."支持者哦!";
                     if (empty($key)) { //最大支持者
                         $message = "恭喜你成为《$item->name》的《梦主》!
-                       ". $user->nickanme."会以你提供的微信/电话联系你约好时间地点亲自感谢你给予的支持和鼓励。如果你不希望见面或
+                       ". $user->nickname."会以你提供的微信/电话联系你约好时间地点亲自感谢你给予的支持和鼓励。如果你不希望见面或
                         不想要梦想者拥有你的联系方式,请按《不需要见面》的按钮或联系客服。";
                         $arr = [
                             'user_id'=>0,

+ 4 - 3
server/app/Http/Controllers/Api/V1/MyController.php

xqd
@@ -326,18 +326,19 @@ class MyController extends Controller
 //        支持消息有 7私信 8@ 9梦想倒计时 10排名 梦想结束
 //        XX在互动上已经提起了你999次!你还不去瞧一瞧?你也太大牌啦!
         $user = $this->getUser();
-        $data8  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->where('attr_id',8)->orderBy('id','desc')->groupBy('interaction_id')->get()->toArray();
+        $data8  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->where('attr_id',8)->orderBy('id','desc')->get()->toArray();
         dd($data8);
         $new_data8 = [] ;
         if (count($data8) > 0) {
             if (count($data8) >= 5) {
-                $data8[0]['message'] = "XX在互动上已经提起了你".count($data8)."次!你还不去瞧一瞧?你也太大牌啦!";
+                $data8[0]['message'] = "梦想互动上已经提起了你".count($data8)."次!你还不去瞧一瞧?你也太大牌啦!";
                 $new_data8[] = $data8[0];
             }else{
                 $new_data8 = $data8;
             }
         }
-        $data  =  SystemInfoModel::where('user_id',$user->id)->where('type_id',2)->orderBy('id','desc')->get();
+        $data9  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->where('attr_id','!=',8)->orderBy('id','desc')->get()->toArray();
+        $data = array_merge($new_data8,$data9);
         SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->update(['is_read' => 1]);
         return $this->api($data);
     }