add

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

@@ -10,6 +10,7 @@ namespace App\Http\Controllers\Admin\User\Cash;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\AccountLog;
 use App\Models\SystemInfoModel;
+use App\Models\UserCashOut;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
@@ -95,6 +96,7 @@ class OutController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        $info = UserCashOut::find(request('id'));
         if ($data['status'] == 3|| $data['status'] == 2) { //审核不过已打款发送梦想消息
             if ($data['status'] == 3) {
                 $message = '你的提现被拒绝了。客服会在短时间内联系你。';
@@ -115,7 +117,7 @@ class OutController extends Controller
                         'to_name'=>$user->nickname,
                         'to_amount'=>$data['cash'],
                         'channel'=>'平台内',
-                        'transaction_id'=>date('YmdHis') . mt_rand(1000, 9999),
+                        'transaction_id'=>$info->number,
                         'avatar'=>env('APP_URL').'/base/img/jianhao.png',
                     ];
                     AccountLog::create($arr);

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

@@ -130,12 +130,14 @@ class IndexController extends Controller
         }
         $type = $request->type;
         if ($type == 'trend') {
+//            潮流  发布三天之内的梦想
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->whereBetween('created_at',[date('Y-m-d H:i:s'),date('Y-m-d H:i:s',time()+3*24*3600)])->orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);
+            $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->where('created_at','<',date('Y-m-d H:i:s'))->where('created_at','>',date('Y-m-d H:i:s',time()-3*24*3600))->orderBy('score','desc')->with('user')->paginate(20);
             $this->dreams($dreams);
         } elseif ($type == 'news') {
+//            最新  发布不到一天前的梦想   ->whereNotIn('id', $id_arr2)
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->whereBetween('created_at',[date('Y-m-d H:i:s'),date('Y-m-d H:i:s',time()+24*3600)])->orderBy('score','desc')->orderBy('created_at','desc')->with('user')->whereNotIn('id', $id_arr2)->paginate(20);
+            $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->where('created_at','<',date('Y-m-d H:i:s'))->where('created_at','>',date('Y-m-d H:i:s',time()-1*24*3600))->orderBy('created_at','desc')->with('user')->paginate(20);
             $this->dreams($dreams);
         } else{
 //            热门

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

@@ -583,8 +583,10 @@ class MyController extends Controller
 //        $info['to_name'] = $data['account']; //账号
 //        $info['note'] = $data['type'].$data['name'];
 //        $ok = AccountLog::create($info);
+        $transaction_id = date('YmdHis') . mt_rand(1000, 9999);
         $data['user_id'] = $user->id;
         $data['status'] = 1;
+        $data['number'] = $transaction_id;
         $ok = UserCashOut::create($data);
 
         $message = '你提现的¥'.$data["cash"].'已经到账啦，去实现梦想吧！喵～ ';

server/database/migrations/2017_11_06_202218_change_number_to_user_cash_out_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeNumberToUserCashOutTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_cash_out', function (Blueprint $table) {
+            $table->string('number')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_cash_out', function (Blueprint $table) {
+            //
+        });
+    }
+}

server/resources/views/admin/user/cash/out/index.blade.php

@@ -37,7 +37,7 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> id </th>
-            <th class="sorting" data-sort="transaction_id"> 交易号 </th>
+            <th class="sorting" data-sort="number"> 交易号 </th>
             <th class="sorting" data-sort="user_id"> 提现用户 </th>
             <th class="sorting" data-sort="bank_id"> 提现银行 </th>
             <th class="sorting" data-sort="bank_id"> 卡号 </th>
@@ -54,7 +54,7 @@
 							@foreach($list as $key => $item)							<tr>
 
 			<td>{{ $item->id }}</td>
-			<td>{{ $item->transaction_id }}</td>
+			<td>{{ $item->number }}</td>
 			<td>{{ !empty($item->user) ? $item->user->nickname : '' }}</td>
 			<td>{{ !empty($item->bank) ? $item->bank->bank_name : '' }}</td>
 			<td>{{ !empty($item->bank) ? $item->bank->bank_number : '' }}</td>