diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 6a3849e40..52c59f193 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -7212,7 +7212,7 @@ class ExportController extends Controller if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "pay_time > {$timestart}"; + $map['_string'] = "pay_time >= {$timestart}"; } if (!empty(I('timeend'))) { diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index e72fdb907..4c97a2eac 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -715,7 +715,7 @@ class FinanceController extends ThinkController if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "s.pay_time > {$timestart}"; + $map['_string'] = "s.pay_time >= {$timestart}"; } if (!empty(I('timeend'))) { @@ -784,7 +784,7 @@ class FinanceController extends ThinkController if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "pay_time > {$timestart}"; + $map['_string'] = "pay_time >= {$timestart}"; } if (!empty(I('timeend'))) { diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index a94784d64..a0b36d08a 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -116,6 +116,7 @@ class PromoteController extends ThinkController $map['oa_associated'] = I('oa_associated'); $oa_data = []; for ($i = 1; $i > 0; $i++) { + $arr = []; $arr['time'] = time(); $arr['page'] = $i; $arr['pageSize'] = 1000; @@ -125,7 +126,7 @@ class PromoteController extends ThinkController $arr['sign'] = $sign; $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr); $re_data = json_decode($re_data, true); - if ($re_data['code'] == 1) { + if (!empty($re_data['data'])) { $oa = $re_data['data']; $oa_data = array_merge($oa_data, $oa); } else { diff --git a/Application/Admin/Controller/TestWhiteListController.class.php b/Application/Admin/Controller/TestWhiteListController.class.php index da0f11cc7..98566be9a 100644 --- a/Application/Admin/Controller/TestWhiteListController.class.php +++ b/Application/Admin/Controller/TestWhiteListController.class.php @@ -138,19 +138,24 @@ class TestWhiteListController extends ThinkController $user = M('user','tab_')->where($userData)->find(); - if ($user) { - $this->error('账号已经存在'); + if (!$user) { + $this->error('账号不存在'); } - $userData['password'] = md5(sha1('123456') . UC_AUTH_KEY); - $userData['promote_id'] = 0; - $userData['promote_account'] = '官方渠道'; - $userData['register_time'] = time(); - $userData['check_status'] = $data['status']?$data['status']:0; +// $userData['password'] = md5(sha1('123456') . UC_AUTH_KEY); +// $userData['promote_id'] = 0; +// $userData['promote_account'] = '官方渠道'; +// $userData['register_time'] = time(); +// $userData['check_status'] = $data['status']?$data['status']:0; +// +// $userAdd = M('user','tab_')->add($userData); +// if ($userAdd) { +// dump($user);die(); - $userAdd = M('user','tab_')->add($userData); - if ($userAdd) { - $data['user_id'] = $userAdd; + $userWhite = M('test_white_list','tab_')->where(['user_id'=>$user['id']])->find(); + + if (!$userWhite) { + $data['user_id'] = $user['id']; $data['show_status'] = $data['status']?$data['status']:0; $data['add_user'] = $_SESSION['onethink_admin']['user_auth']['username']; $data['create_ime'] = time(); @@ -161,11 +166,16 @@ class TestWhiteListController extends ThinkController } else { $this->error('添加白名单失败'); } - } else { - $this->error('添加用户失败'); + $this->error('白名单以添加，请勿重复添加'); } + + +// } else { +// $this->error('添加用户失败'); +// } + } public function freezeSupport() { @@ -190,4 +200,32 @@ class TestWhiteListController extends ThinkController } } + public function deleteWhileUser() { + + $userId = $_REQUEST['id']; + +// dump($userId);die(); + + $userWhite = M('test_white_list','tab_')->where(['id'=>$userId])->find(); + + + if ($userWhite) { + + $del = M('test_white_list','tab_')->where(['id'=>$userId])->delete(); + + if ($del) { + $this->ajaxReturn(['status'=>0,'msg'=>"删除成功"]); + } else { + $this->ajaxReturn(['status'=>0,'msg'=>"删除失败"]); + } + + } else { + + $this->ajaxReturn(['status'=>0,'msg'=>"账号不存在，删除失败"]); + + } + + + } + } diff --git a/Application/Admin/View/TestWhiteList/lists.html b/Application/Admin/View/TestWhiteList/lists.html index 2d24fc52a..bd767247c 100644 --- a/Application/Admin/View/TestWhiteList/lists.html +++ b/Application/Admin/View/TestWhiteList/lists.html @@ -81,7 +81,11 @@ {$data.add_user} {$data.create_ime} - 编辑 + + + + 删除 + 锁定 @@ -151,6 +155,25 @@ } }) + $('.del_user').on({ + click: function() { + var url = $(this).attr('href-hhh'); + console.log(url); + layer.confirm('是否确认删除测试账号?', {icon: 3, title:'提示',skin:'textColor'}, function(index){ + $.ajax({ + url: url, + type: 'post', + dataType: 'json', + success: function(response) { + layer.msg(response.msg, {time: 1000,skin:'msgClolor'}, function() { + window.location.href = window.location.href + }) + } + }) + }) + } + }) + //搜索功能 $("#search").click(function () { var url = $(this).attr('url');