异常处理

app/Http/Controllers/Admin/WagentController.php

@@ -27,14 +27,14 @@ class WagentController extends Controller {
         $dt->setLang('wagent');
         $dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
         $dt->addColsFields('agent_key_secret', array('templet' => '#agent_key_secret', 'sort' => false, 'width' => 265));
-        $dt->addColsFields('create_time', array('templet' => '#totime', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('frozen_money', array('templet' => '#frozen_money', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('money', array('templet' => '#totime', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('zjrecord_xxrecord', array('templet' => '#zjrecord_xxrecord', 'sort' => false, 'width' => 180));
+        $dt->addColsFields('create_time', array('templet' => '#totime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('frozen_money', array('templet' => '#frozen_money', 'sort' => false, 'width' => 130));
+        $dt->addColsFields('money', array('templet' => '#totime', 'sort' => false, 'width' => 130));
+        $dt->addColsFields('zjrecord_xxrecord', array('templet' => '#zjrecord_xxrecord', 'sort' => false, 'width' => 140));
         if (checkRriv('/admin/wagent/edit')) {
 			$arr[] = 'edit';
 		}
-		$dt->setToolBar($arr, array('width' => 100));
+		$dt->setToolBar($arr, array('width' => 80));
         $dt->enableCheckBox();
 		return view('admin.wagent/index', $dt->render($request));
 	}
@@ -43,6 +43,7 @@ class WagentController extends Controller {
 	function zjrecord(Req $req){
 		$request=array();
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+		$request['ordernumber'] = isset($req->ordernumber) ? trim($req->ordernumber) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
@@ -51,11 +52,12 @@ class WagentController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/wagent/zjrecordinfo');
         $dt->setLang('wagent');
-        $dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 200));
-        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false, 'width' => 230));
-        $dt->addColsFields('credit', array('templet' => '#newtime', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('agent_money_before', array('templet' => '#newtime', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('agent_money_after', array('templet' => '#newtime', 'sort' => false, 'width' => 120));
+        //$dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false, 'width' => 150));
+        $dt->addColsFields('credit', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('agent_money_before', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('agent_money_after', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+		$dt->addColsFields('datetime', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
         $dt->enableCheckBox();
 		return view('admin.wagent/zjrecord', $dt->render($request));
 	}
@@ -64,17 +66,30 @@ class WagentController extends Controller {
 		$page = Request::has('page') ? Request::get('page') : '';
 		$list = Request::has('limit') ? Request::get('limit') : 10;
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
+		$ordernumber = Request::has('ordernumber') ? Request::get('ordernumber') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 		$where = array();
 		if (!empty($home_team)) {
+			$where[] = array('wagent_log.agent_name', '=', $home_team);
+		}
+		if (!empty($ordernumber)) {
 			if (empty($sureblur) || $sureblur == 'off') {
-				$where[] = array('wagent_log.agent_name', 'like', '%' . $home_team . '%');
+				$where[] = array('wagent_log.ordernumber', 'like', '%' . $ordernumber . '%');
 			} else {
-				$where[] = array('wagent_log.agent_name', '=', $home_team);
+				$where[] = array('wagent_log.ordernumber', '=', $ordernumber);
 			}
 		}
+		//追加时间范围条件
+		if (!empty($star_time)) {
+			$star_time = date('Y-m-d H:i:s', strtotime($star_time));
+			$where[] = array('datetime', '>=', $star_time);
+		}
+		if (!empty($end_time)) {
+			$end_time = date('Y-m-d H:i:s', strtotime($end_time));
+			$where[] = array('datetime', '<=', $end_time);
+		}
 
 		$newapp = new \App\Models\Wagentlog();
         $data = $newapp->wagentloglist($list, $page, $where);
@@ -86,6 +101,7 @@ class WagentController extends Controller {
 	function xxrecord(Req $req){
 		$request=array();
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+		$request['ordernumber'] = isset($req->ordernumber) ? trim($req->ordernumber) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
@@ -94,11 +110,10 @@ class WagentController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/wagent/xxrecordinfo');
         $dt->setLang('wagent');
-        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false, 'width' => 300));
-        $dt->addColsFields('tradeamount', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('blance', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('addtime', array('templet' => '#newtime', 'sort' => false, 'width' => 160));
-        $dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('ordernumber', array('templet' => '#newtime', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('tradeamount', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('blance', array('templet' => '#newtime', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('addtime', array('templet' => '#newtime', 'sort' => false, 'width' => 150));
         $dt->enableCheckBox();
 		return view('admin.wagent/xxrecord', $dt->render($request));
 	}
@@ -107,17 +122,30 @@ class WagentController extends Controller {
 		$page = Request::has('page') ? Request::get('page') : '';
 		$list = Request::has('limit') ? Request::get('limit') : 10;
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
+		$ordernumber = Request::has('ordernumber') ? Request::get('ordernumber') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 		$where = array();
 		if (!empty($home_team)) {
+			$where[] = array('money_transfer.agent_name', '=', $home_team);
+		}
+		if (!empty($ordernumber)) {
 			if (empty($sureblur) || $sureblur == 'off') {
-				$where[] = array('money_transfer.agent_name', 'like', '%' . $home_team . '%');
+				$where[] = array('money_transfer.ordernumber', 'like', '%' . $ordernumber . '%');
 			} else {
-				$where[] = array('money_transfer.agent_name', '=', $home_team);
+				$where[] = array('money_transfer.ordernumber', '=', $ordernumber);
 			}
 		}
+		//追加时间范围条件
+		if (!empty($star_time)) {
+			$star_time = date('Y-m-d H:i:s', strtotime($star_time));
+			$where[] = array('addtime', '>=', $star_time);
+		}
+		if (!empty($end_time)) {
+			$end_time = date('Y-m-d H:i:s', strtotime($end_time));
+			$where[] = array('addtime', '<=', $end_time);
+		}
 
 		$newapp = new \App\Models\Moneytransfer();
         $data = $newapp->moneytransferlist($list, $page, $where);
@@ -173,29 +201,41 @@ class WagentController extends Controller {
 		} else {
 			$newapp = new \App\Models\Wagentlog();
 			$model = \App\Models\Wagent::where('id', $id)->first();
-			$newapp->agent_money_before = $model['money'];//交易前金额
+			$money = $model['money'];
+			$frozen_money = $req->input('frozen_money');
+			if($frozen_money>0 && $frozen_money != $model['frozen_money']){
+				$money = $model['money']+$model['frozen_money']-$frozen_money;
+				$model->frozen_money = $frozen_money;
+				$model->money = $money;
+			}
+			$newapp->agent_money_before = $money;//交易前金额
 			$upmoney = $req->input('upmoney');
 			$type = $req->input('type');
-
-			if($type==1){
-				$model->money = $model['money']+$upmoney;
-			}
-			if($type==2){
-				if($model['money']>=$upmoney){
-					$model->money = $model['money']-$upmoney;
+			$model->status = $req->input('status');
+			if(empty($upmoney)){
+				$model->save();
+			}else{
+				if($type==1){
+					$model->money = $model['money']+$upmoney;
+				}
+				if($type==2){
+					if($model['money']>=$upmoney){
+						$model->money = $model['money']-$upmoney;
+					}
 				}
+				$model->save();
+
+				//资金纪录日志
+				$newapp->datetime = date('Y-m-d H:i:s',time());//代理名称
+				$newapp->agent_name = $model['agent_name'];//代理名称
+				$newapp->account_identity = 0;//默认值
+				$newapp->ordernumber = 'ST'.date("Ymdhis").mt_rand(100000, 999999);//订单号
+				$newapp->credit = $upmoney;//改变金额
+				$newapp->agent_money_after = $model->money;//交易后金额
+				$newapp->uid = session('adminInfo.admin_id');//操作员id
+				$newapp->save();
 			}
-			$model->status = $req->input('status');
-			$model->save();
 
-			//资金纪录日志
-			$newapp->agent_name = $model['agent_name'];//代理名称
-			$newapp->account_identity = 0;//默认值
-			$newapp->ordernumber = 'ST'.date("Ymdhis").mt_rand(100000, 999999);//订单号
-			$newapp->credit = $upmoney;//改变金额
-			$newapp->agent_money_after = $model->money;//交易后金额
-			$newapp->uid = session('adminInfo.admin_id');//操作员id
-			$newapp->save();
 			return responseToJson(1);
 		}
 	}	

resources/views/admin/wagent/edit.blade.php

@@ -11,6 +11,13 @@
                        readonly="readonly">
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">冻结金额</label>
+            <div class="layui-input-block">
+                <input type="text" name="frozen_money" lay-verify="zhengnumber" placeholder="请输入冻结金额" autocomplete="off" class="layui-input"
+                       style="width:200px;" value="{{ isset($frozen_money)?$frozen_money:'' }}">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">可用余额</label>
             <div class="layui-input-block">
@@ -28,7 +35,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">金 额:</label>
             <div class="layui-input-block">
-                <input type="text" name="upmoney" lay-verify="number|zhengnumber" placeholder="请输入金额" autocomplete="off"
+                <input type="text" name="upmoney" lay-verify="zhengnumber" placeholder="请输入金额" autocomplete="off"
                        class="layui-input" style="width:200px;" value="">
             </div>
         </div>

resources/views/admin/wagent/xxrecord.blade.php

@@ -20,6 +20,9 @@
         .layui-form-item .checkbox {
             width: auto;
         }
+        .layui-table-cell.laytable-cell-1-0.laytable-cell-checkbox {
+            display: none;
+        }
     </style>
 
     
@@ -43,7 +46,8 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('wagent.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="hidden" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="ordernumber" id="ordernumber" eventType="event-query"  value="{{ $ordernumber }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -67,8 +71,8 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- @if(checkRriv('/admin/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         <!-- @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif -->
                     </div>
                 </div>
@@ -124,10 +128,13 @@ $('.lay-btn-diy').on('click', function(){
 
   //重置表单
   $('.reset').on('click',function(){
-      $('input').val('');
-      $('#form_statuss').val('');
-      //var type = $(this).data('type');
-      //active[type] ? active[type].call(this) : '';
+    //$('input').val('');
+    $('#ordernumber').val('');
+    $('#star_time').val('');
+    $('#end_time').val('');
+    $('#form_statuss').val('');
+    //var type = $(this).data('type');
+    //active[type] ? active[type].call(this) : '';
   });
   //刷新表单
     $('.set').on('click',function(){

resources/views/admin/wagent/zjrecord.blade.php

@@ -20,6 +20,9 @@
         .layui-form-item .checkbox {
             width: auto;
         }
+        .layui-table-cell.laytable-cell-1-0.laytable-cell-checkbox {
+            display: none;
+        }
     </style>
 
     <script type="text/html" id="status">
@@ -33,7 +36,8 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('wagent.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="hidden" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="ordernumber" id="ordernumber" eventType="event-query"  value="{{ $ordernumber }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -57,10 +61,10 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                        @if(checkRriv('/admin/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif
-                        <!-- @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif -->
-                        <a class="layui-btn layui-btn-sm" href="javascript:history.go(-1)">返回</a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- @if(checkRriv('/admin/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif -->
+                        <!-- @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        <a class="layui-btn layui-btn-sm" href="javascript:history.go(-1)">返回</a> -->
                     </div>
                 </div>
             </form>
@@ -115,10 +119,13 @@ $('.lay-btn-diy').on('click', function(){
 
   //重置表单
   $('.reset').on('click',function(){
-      $('input').val('');
-      $('#form_statuss').val('');
-      //var type = $(this).data('type');
-      //active[type] ? active[type].call(this) : '';
+    //$('input').val('');
+    $('#ordernumber').val('');
+    $('#star_time').val('');
+    $('#end_time').val('');
+    $('#form_statuss').val('');
+    //var type = $(this).data('type');
+    //active[type] ? active[type].call(this) : '';
   });
   //刷新表单
     $('.set').on('click',function(){