add

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -39,7 +39,7 @@ class InfoController extends Controller
         }else{
             $query = $query->pushCriteria(new OrderBy('id','desc'));
         }
-        $list = $query->paginate();
+        $list = $query->with(['meet'])->paginate();
         $ab_value = BaseSettingsModel::where('category','paihang')->first();
         return view('admin.dream.info.index',compact('list','ab_value'));
     }

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

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\User\Cash;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\SystemInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Cash\Criteria\MultiWhere;
@@ -92,6 +93,19 @@ class OutController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        if ($data['status'] == 3|| $data['status'] == 2) { //审核不过已打款发送梦想消息
+            if ($data['status'] == 3) {
+                $message = '你的提现被拒绝了。客服会在短时间内联系你。';
+            }else{
+                $message = '你提现的¥'.$data['cash'].'已经到账啦，去实现梦想吧！喵～';
+            }
+            $arr = [
+                'type_id'=>2,
+                'to_user_id'=>$data['user_id'],
+                'message'=>$message,
+            ];
+            SystemInfoModel::create($arr);
+        }
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'User/Cash/Out/index'),'title'=>'返回列表');

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

@@ -239,7 +239,7 @@ class HomeController extends Controller
             'dream_id'=>$dream_id,
             'dream_user_id'=>$dream_user_id,
         ];
-        MeetInfoModel::create($data);
+        MeetInfoModel::firstOrCreate($data);
         return $this->api('');
     }
 }

server/app/Models/DreamInfoModel.php

@@ -76,4 +76,9 @@ class DreamInfoModel extends BaseModel
         return $this->hasManyThrough('App\Models\CommentInfoModel', 'App\Models\InteractionInfo','dream_id','interaction_id');
     }
 
+    public function meet()
+    {
+        return $this->hasOne('App\Models\MeetInfoModel','dream_id');
+    }
+
 }

server/app/Models/SystemInfoModel.php

@@ -37,6 +37,8 @@ class SystemInfoModel extends BaseModel
                            'is_read',
                            'interaction_id',
                            'dream_id',
+                           'type_id',
+                           'is_url',
                           ];
 
     public function user()

server/app/Repositories/User/Cash/Criteria/MultiWhere.php

@@ -38,10 +38,10 @@ class MultiWhere extends Criteria {
           if(isset($this->search['keyword']) && $this->search['keyword']) {
               $keyword = '%'.$this->search['keyword'].'%';
                 $model = $model->whereHas('user', function ($query) use ($keyword) {
-                    $query->where('nickname','like','$keyword');
+                    $query->where('nickname','like',$keyword);
                 })->orWhereHas('bank', function ($query) use ($keyword) {
-                    $query->where('bank_name','like','$keyword')->
-                    orWhere('bank_number','like','$keyword');
+                    $query->where('bank_name','like',$keyword)->
+                    orWhere('bank_number','like',$keyword);
                 });
           }
 //          dump($keyword);

server/database/migrations/2017_10_30_152951_add_type_id_to_system_info_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTypeIdToSystemInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('system_info', function (Blueprint $table) {
+            $table->smallInteger('type_id')->default(0)->comment('0通知消息1梦想消息2支持消息')->after('dream_id');
+            $table->smallInteger('is_url')->default(0)->comment('0点击消息不跳转1跳转')->after('dream_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('system_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

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

@@ -45,6 +45,7 @@
 			<th class="sorting" data-sort="sign"> 梦想标签 </th>
 			<th class="sorting" data-sort="parameter"> 排行参数 </th>
 			<th class="sorting" data-sort="code"> 二维码 </th>
+			<th class="sorting" data-sort="code"> 扫描时间 </th>
 			<th class="sorting" data-sort="status"> 梦想状态 </th>
 			<th class="sorting" data-sort="created_at"> 梦想发布时间 </th>
 			<th class="sorting" data-sort="end_time"> 梦想结束时间 </th>
@@ -72,6 +73,7 @@
 			<td>
 				<a onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('/Dream/Info/show_code',['code'=> $item->code])}}'});"  class="btn btn-primary ">查看</a>
 			</td>
+			<td>{{ empty($item->meet) ? '' : $item->meet->created_at  }}</td>
 			<td>{{ dict()->get('dream_info','status',$item->status) }}</td>
 			<td>{{$item->created_at }}</td>
 			<td>{{$item->end_time}}</td>

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

@@ -35,49 +35,25 @@
                         <div class="col-lg-10">
                             <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
 
-                                    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">提现用户id</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_user_id" name="data[user_id]" class="form-control" value="{{ $data['user_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">绑定的提现方式id</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_bank_id" name="data[bank_id]" class="form-control" value="{{ $data['bank_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">提现状态: 0, 申请提现; 1,审核通过; 2,已打款; 3,审核未通过</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_status" name="data[status]" class="form-control" value="{{ $data['status'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">提现金额</label>
+                 <label class="control-label col-sm-3">提现状态</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_cash" name="data[cash]" class="form-control" value="{{ $data['cash'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       <select name="data[status]" id="" class="form-control">
+                           @foreach( dict()->get('global','cash_out') as $key =>$val)
+                               <option value="{{$key}}" {{isset($data['status']) && $data['status']==$key?'selected':''}}>{{$val}}</option>
+                           @endforeach
+                       </select>
                     </div>
                                 
-                </div>    
+                </div>
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">审核未通过原因, 备注等</label>
+                 <label class="control-label col-sm-3">备注</label>
                                     
                    <div class="col-sm-9">
-                     <textarea name="data[comments]" id="editorcomments" required="" aria-required="true" class="form-control" rows="10">{{ $data['comments'] or ''}}</textarea>
+                     <textarea name="data[comments]" id="editorcomments" class="form-control" rows="10">{{ $data['comments'] or ''}}</textarea>
                                        
                      {!! editor('editorcomments', ['position' => 'ali', 'folder' => 'upload/common'], ['themeType' => 'simple', 'height' => '300px']) !!}
                                             
@@ -91,6 +67,8 @@
                                         <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
                                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
                                         <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="hidden" name="data[user_id]" value="{{$data['user_id'] or ''}}">
+                                        <input type="hidden" name="data[cash]" value="{{$data['cash'] or ''}}">
                                         <input type="reset" class="btn btn-default" >
                                     </div>
                                 </div>

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

@@ -18,18 +18,18 @@
 
 				        <div class="col-sm-4">
 				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="提现用户名/银行名/银行卡号" name="keyword"class="input-sm form-control">
 								<span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
     						</div>
 				        </div>
 				        </form>
-						@if(role('User/Cash/Out/create'))
+					{{--	@if(role('User/Cash/Out/create'))
     					<div class="col-sm-3 pull-right">
     					   <a href="{{ U('User/Cash/Out/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
     					</div>
-						@endif
+						@endif--}}
 					</div>
 					
 					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
@@ -37,9 +37,12 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> 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>
+            <th class="sorting" data-sort="bank_id"> 提现银行 </th>
+            <th class="sorting" data-sort="bank_id"> 卡号 </th>
+            <th class="sorting" data-sort="bank_id"> 银行卡手机号 </th>
+            <th class="sorting" data-sort="bank_id"> 银行卡姓名 </th>
             <th class="sorting" data-sort="status"> 提现状态</th>
             <th class="sorting" data-sort="cash"> 提现金额 </th>
             <th class="sorting" data-sort="created_at"> 提现时间 </th>
@@ -51,9 +54,12 @@
 							@foreach($list as $key => $item)							<tr>
 
 			<td>{{ $item->id }}</td>
+			<td>{{ $item->number }}</td>
 			<td>{{ !empty($item->user) ? $item->user->nickname : '' }}</td>
-			<td>{{ !empty($item->bank) ? $item->bank->bank_number : '' }}</td>
 			<td>{{ !empty($item->bank) ? $item->bank->bank_name : '' }}</td>
+			<td>{{ !empty($item->bank) ? $item->bank->bank_number : '' }}</td>
+			<td>{{ !empty($item->bank) ? $item->bank->bank_phone : '' }}</td>
+			<td>{{ !empty($item->bank) ? $item->bank->bank_user : '' }}</td>
             <td>{{  dict()->get('global','cash_out',$item->status) }}</td>
             <td>{{ $item->cash }}</td>
             <td>{{ $item->created_at }}</td>
@@ -78,9 +84,6 @@
 
 										</ul>
 									</div>
-								@if(role('User/Cash/Out/view'))
-										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Cash/Out/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
-									@endif
 								</td>
 							</tr>
 							@endforeach