Merge branch 'gq' of http://git.9026.com/roobe/miao

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

@@ -12,10 +12,16 @@ class InfoController extends Controller
     public function index(Request $request)
     {
         $id =  $request->id;
-        $list = AccountLog::where('from_id',$id)->where('to_id',$id)
-            ->where('op','充值')->orderBy('id','desc')->paginate(20);
+//        $list = AccountLog::where('from_id',$id)->where('to_id',$id)
+//            ->where('op','充值')->orderBy('id','desc')->paginate(20);
+        $list = AccountLog::where('from_id',$id)->orWhere('to_id',$id)
+           ->orderBy('id','desc')->paginate(20);
+        if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
+            $list = AccountLog::where('from_id',$id)->orWhere('to_id',$id)
+                ->orderBy($request['sort_field'],$request['sort_field_by'])->paginate(20);
+        }
         Log::info($list);
-        return view('admin.account_log.index',compact('list'));
+        return view('admin.account_log.index',compact('list','id'));
     }
 
     public function destroy(Request $request)

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/Admin/User/InfoController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\User;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\AccountLog;
 use App\Models\BaseAttachmentModel;
 use App\Models\MeetInfoModel;
 use App\Models\SearchInfoModel;
@@ -222,4 +223,45 @@ class InfoController extends Controller
             return  $this->showWarning("操作失败");
         }
     }
+/**
+    加减币
+ */
+    public function editCoin(Request $request)
+    {
+        $status = $request->input('status');
+        $user_id = request('id');
+        $user = UserInfoModel::find($user_id);
+        if ($request->isMethod('POST')) {
+            $data = ($request->data);
+            if (empty($status)) {
+                return $this->showWarning("请选择交易类型");
+            }
+            $data['from_type']='梦想币';
+            $data['from_id']=0;  //设置初始值
+            $data['from_amount']=$data['to_amount'];
+            $data['from_type']='梦想币';
+            $data['to_id']=$user_id;
+            $data['channel']='后台';
+            $data['transaction_id']=date('YmdHis') . mt_rand(1000, 9999);
+            if (($status)==2) {   //2减
+                if ($user->coin<$data['to_amount']) {
+                    return $this->showWarning("交易数额不合法，请填写不大于{$user->coin}的金额");
+                }
+                $user->coin -= $data['to_amount'];
+                $data['from_id']=$user_id;
+                $data['avatar']=env('APP_URL').'/base/img/jianhao.png';
+            }else{//1加
+                $user->coin += $data['to_amount'];
+                $data['avatar']=env('APP_URL').'/base/img/jiahao.png';
+            }
+            $user->save();
+           $ok = AccountLog::create($data);
+            if (!$ok) {
+                return $this->showWarning("操作失败");
+            }else{
+                return $this->showMessage('操作成功');
+            }
+        }
+        return view('admin.user.info.editcoin');
+    }
 }

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

@@ -462,6 +462,9 @@ class DreamController extends Controller
             $dream->mark += $coin*$number;
             $dream->save();
             $to_user = $dream->user;
+
+            $user_coin = $user->coin;
+
 //            支持成功记录交易记录
             if (!empty($to_user)) {
                 $arr = [
@@ -554,7 +557,6 @@ class DreamController extends Controller
 //            梦想分 mark
             $dream->top3user = $top3user;
             $dream->is_collection = $is_collection;
-            $user_coin = $user->coin;
             return $this->api(compact('dream','user_coin','number'));
         }
     }

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

@@ -132,17 +132,17 @@ class IndexController extends Controller
         if ($type == 'trend') {
 //            潮流  发布三天之内的梦想
             $banners = $this->getBanner();
-            $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);
+            $dreams = DreamInfoModel::where('status',1)->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'))->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);
+            $dreams = DreamInfoModel::where('status',1)->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{
 //            热门
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::where('end_time','>',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->paginate(15);
+            $dreams = DreamInfoModel::where('status',1)->where('end_time','>',date('Y-m-d H:i:s'))->orderBy('score','desc')->with('user')->paginate(15);
             $this->dreams($dreams);
         }
         foreach ($dreams as $dream) {

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);
     }
@@ -583,6 +596,7 @@ class MyController extends Controller
 //        $info['to_name'] = $data['account']; //账号
 //        $info['note'] = $data['type'].$data['name'];
 //        $ok = AccountLog::create($info);
+        if($data['cash']>$user->coin) return $this->error(ErrorCode::COIN_NOT_ENOUGH);
         $transaction_id = date('YmdHis') . mt_rand(1000, 9999);
         $data['user_id'] = $user->id;
         $data['status'] = 1;
@@ -753,7 +767,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 +895,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 = '已完成';

server/resources/views/admin/account_log/index.blade.php

@@ -16,11 +16,11 @@
 					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
 						<thead>
     						<tr>
-								
-            <th  data-sort="to_type"> 充值类型 </th>
-            <th  data-sort="transaction_id"> 交易号 </th>
-            <th  data-sort="to_amount"> 充值金额(元) </th>
-            <th  data-sort="created_at"> 充值时间 </th>
+
+			<th  class="sorting"  data-sort="transaction_id"> 交易号 </th>
+			<th  class="sorting" data-sort="op"> 充值类型 </th>
+            <th  class="sorting" data-sort="to_amount"> 交易的梦想币 </th>
+            <th  class="sorting" data-sort="created_at"> 交易时间 </th>
         						{{--<th width="22%">相关操作</th>--}}
         					</tr>
 						</thead>
@@ -28,9 +28,20 @@
 						@if(isset($list))
 							@foreach($list as $key => $item)
 								<tr>
-									<td>{{ $item->to_type }}</td>
 									<td>{{ $item->transaction_id }}</td>
-									<td>{{ $item->to_amount /100}}</td>
+									<td>{{ $item->op }}</td>
+									<td>
+										@if($item->op=='充值')
+											+
+										@elseif($item->op=='提现')
+											-
+										@elseif($item->from_id==$id)
+											-
+										@elseif($item->to_id==$id)
+											+
+										@endif
+										{{ $item->to_amount}}
+									</td>
 									<td>{{ $item->created_at }}</td>
 									{{--<td>
 										<a href="{{ U('Account_logs/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-primary ">删除</a>

server/resources/views/admin/user/info/editcoin.blade.php

@@ -0,0 +1,87 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>加减币</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				   {{-- <div class="row">
+    					<div class="col-sm-3 pull-right">
+                            <a href="{{ U('User/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+                        </div>
+					</div>--}}
+
+		            <div class="row">
+                        <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">交易类型</label>
+
+                                    <div class="col-sm-9">
+                                        <input type="radio" name="status" value="1" >加
+                                        &nbsp; &nbsp; &nbsp;
+                                        <input type="radio" name="status" value="2"  >减
+                                    </div>
+
+                                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">交易数目</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="" name="data[to_amount]" class="form-control" value="{{ $data['to_amount'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+
+                                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">交易信息</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="" name="data[op]" class="form-control" value="{{ $data['op'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+
+                                </div>
+
+                                
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <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="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+        
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+@endsection

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

@@ -109,7 +109,8 @@
 								@if(role('User/Info/view'))
 										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
 									@endif
-									<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Account_logs/Info/index',['id'=>$item->id])}}'});"  class="btn btn-primary ">充值记录</button>
+									<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Account_logs/Info/index',['id'=>$item->id])}}'});"  class="btn btn-primary ">交易记录</button>
+									<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/editCoin',['id'=>$item->id])}}'});"  class="btn btn-success ">加减币</button>
 									{{--<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Account_logs/Info/index',['id'=>$item->id])}}'});"  class="btn btn-success ">提现记录</button>--}}
 								</td>
 							</tr>