add

server/app/Http/Controllers/Admin/User/Cash/OutController.php

@@ -104,25 +104,27 @@ class OutController extends Controller
                 $message = '亲，你的提现我们已经审批通过，你的梦想基金很快就到账了哦！';
             }else{
 //                已打款  记录提现日志  并且用户的账号梦想币减少
-                $user = UserInfoModel::find($data['user_id']);
-                $user->coin -=$data['cash'];
-                $user->save();
-                if (!empty($user)) {
-                    $arr = [
-                        'from_type'=>'梦想币',
-                        'from_id'=>$data['user_id'],
-                        'from_name'=>$user->nickname,
-                        'op'=>'提现',
-                        'from_amount'=>$data['cash'],
-                        'to_type'=>'现金',
-                        'to_id'=>$data['user_id'],
-                        'to_name'=>$user->nickname,
-                        'to_amount'=>$data['cash'],
-                        'channel'=>'平台内',
-                        'transaction_id'=>$info->number,
-                        'avatar'=>env('APP_URL').'/base/img/jianhao.png',
-                    ];
-                    AccountLog::create($arr);
+                if ($info['status']!=2) {  //避免重复操作
+                    $user = UserInfoModel::find($data['user_id']);
+                    $user->coin -=$data['cash'];
+                    $user->save();
+                    if (!empty($user)) {
+                        $arr = [
+                            'from_type'=>'梦想币',
+                            'from_id'=>$data['user_id'],
+                            'from_name'=>$user->nickname,
+                            'op'=>'提现',
+                            'from_amount'=>$data['cash'],
+                            'to_type'=>'现金',
+                            'to_id'=>$data['user_id'],
+                            'to_name'=>$user->nickname,
+                            'to_amount'=>$data['cash'],
+                            'channel'=>'平台内',
+                            'transaction_id'=>$info->number,
+                            'avatar'=>env('APP_URL').'/base/img/jianhao.png',
+                        ];
+                        AccountLog::create($arr);
+                    }
                 }
                 $message = '你提现的¥'.$data['cash'].'已经到账啦，去实现梦想吧！喵～';
             }

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

@@ -302,6 +302,12 @@ class MyController extends Controller
             })->orderBy('id','desc')->get()->toArray();
 
         $data = array_merge($new_data1,$new_data2,$new_data3,$data456);
+        if (!empty($data)) {
+            foreach ($data as $key => $row) {
+                $volume[$key]  = $row['id'];
+            }
+            array_multisort($volume, SORT_DESC, $data);
+        }
         SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->update(['is_read' => 1]);
         return $this->api($data);
 //        foreach ($data as $item){   //访问接口  标记已读
@@ -351,6 +357,7 @@ class MyController extends Controller
                 }
                 if (!empty($message)) {
                     $new_data8[] = [
+                        'id'=>1000000,  //排首
                         'dream_id'=>$dream_id,
                         'interaction_id'=>$interaction_id,
                         'message'=>$message,
@@ -367,6 +374,12 @@ class MyController extends Controller
         }
         $data9  =  SystemInfoModel::with('user')->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);
+        if (!empty($data)) {
+            foreach ($data as $key => $row) {
+                $volume[$key]  = $row['id'];
+            }
+            array_multisort($volume, SORT_DESC, $data);
+        }
         SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->update(['is_read' => 1]);
         return $this->api($data);
     }
@@ -753,7 +766,11 @@ class MyController extends Controller
         $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 = '进行中';
+                if ($dream->status==2) {
+                    $dream->type_name = '暂停';
+                }else{
+                    $dream->type_name = '进行中';
+                }
             }else{
                 if ($dream->get_coin >=$dream->coin) {
                     $dream->type_name = '已完成';
@@ -877,7 +894,11 @@ class MyController extends Controller
                 $item->img;
                 $item->user;
                 if (strtotime($item->end_time) > time()) {
-                    $item->type_name = '进行中';
+                    if ($item->status==2) {
+                        $item->type_name = '暂停';
+                    }else{
+                        $item->type_name = '进行中';
+                    }
                 }else{
                     if ($item->get_coin >=$item->coin) {
                         $item->type_name = '已完成';