gq 7 年之前
父节点
当前提交
97df9bfc22

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

xqd xqd
@@ -521,7 +521,9 @@ class DreamController extends Controller
             if (!$ok) {
                 return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
             }
-            $message ="<span style='color: #00c3da '>[". UserInfoModel::find($user->id)->nickname."]</span>".'为你《'.$dream->name.'》支持了'.$coin.'梦想币';
+//            ""."<span style='color: #00c3da'>[UserInfoModel::find($user->id)->nickname]</span> 为你《"
+            $nickname = UserInfoModel::find($user->id)->nickname;
+            $message =""."<span style='color: #00c3da'>[$nickname]</span> 为你《".$dream->name.'》支持了'.$coin.'梦想币';
             $info = [
                 'to_user_id' => $user_id,
                 'user_id'=>$user->id,
@@ -584,7 +586,7 @@ class DreamController extends Controller
         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,

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

xqd xqd xqd
@@ -73,6 +73,7 @@ class InteractionController extends Controller
             }
         }
         $dream_id = $request->id;
+        $dream_name = DreamInfoModel::find($dream_id)->name;
         $title = $request->title;
         $data['dream_id'] = $dream_id;
         $data['title'] = $title;
@@ -87,7 +88,7 @@ class InteractionController extends Controller
                 foreach ($user_ids as $user_id) {
                     $arr['user_id']=$user->id;
                     $arr['to_user_id']=$user_id;
-                    $arr['message']='您支持的梦想又有新的动态啦';
+                    $arr['message']='您支持的梦想《'.$dream_name.'》又有新的动态啦';
                     $arr['interaction_id']=$ok->id;
                     $arr['dream_id']=$dream_id;
                     SystemInfoModel::create($arr);
@@ -408,7 +409,7 @@ class InteractionController extends Controller
             UserCareDream::create($data_info);
             //                关注成功发送私信
             $message = BaseSettingsModel::where('category','message')->first();
-            $message = empty($message) ? "["."<span style='color: #00c3da'>$nickname</span>] 收藏了你的梦想《".$dream->name.'》' : $message->value;
+            $message = empty($message) ? ""."<span style='color: #00c3da'>[$nickname]</span> 收藏了你的梦想《".$dream->name.'》' : $message->value;
             $info2 = [
                 'to_user_id' => $dream->user_id,
                 'message' => $message,

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

xqd
@@ -275,7 +275,7 @@ class MyController extends Controller
         $data2  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',2)->orderBy('id','desc')->get()->toArray();
         $new_data2 = [] ;
         if (count($data2) > 0) {
-            if (count($data2) >= 50) {
+            if (count($data2) >= 5) {
                 $data2[0]['message'] = "已经有".count($data2)."个人收藏了你的梦想!";
                 $data2[0]['is_url'] = 1;
                 $data2[0]['is_reply'] = 0;