From 14a2a7d13211585b8fe8e93ea753c699112a2fcd Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Mon, 11 Sep 2023 11:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=20=E4=B8=8A=E5=88=86?= =?UTF-8?q?=E4=B8=8B=E5=88=86=20=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/AdminAgentTeam.php | 4 +- app/controller/AdminStatistics.php | 3 + app/controller/AdminUser.php | 11 +++ app/controller/AdminUserTeam.php | 3 + app/controller/AdminZoneManage.php | 3 + app/controller/AgentTeam.php | 71 +++++++++++++++++ app/controller/CustomerService.php | 3 + app/controller/Index.php | 7 ++ app/controller/Notice.php | 4 + app/controller/RotationChart.php | 4 + app/controller/User.php | 3 + app/controller/Zone.php | 3 + app/logic/InitData.php | 10 +-- route/app.php | 119 +---------------------------- 14 files changed, 126 insertions(+), 122 deletions(-) diff --git a/app/controller/AdminAgentTeam.php b/app/controller/AdminAgentTeam.php index 79fae50..3f1970a 100644 --- a/app/controller/AdminAgentTeam.php +++ b/app/controller/AdminAgentTeam.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\AgentRechargeRecords; @@ -13,11 +14,12 @@ use app\validate\Agent; use think\exception\ValidateException; use think\facade\Db; use think\facade\Request; -use think\facade\Session; class AdminAgentTeam extends BaseController { + protected $middleware = [CheckAdmin::class]; + /** * 代理列表 * @return array diff --git a/app/controller/AdminStatistics.php b/app/controller/AdminStatistics.php index e7c9d3c..d222bdb 100644 --- a/app/controller/AdminStatistics.php +++ b/app/controller/AdminStatistics.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\AgentUser; @@ -15,6 +16,8 @@ use app\model\User as UserModel; class AdminStatistics extends BaseController { + protected $middleware = [CheckAdmin::class]; + /** * 待办 * @throws \think\db\exception\DataNotFoundException diff --git a/app/controller/AdminUser.php b/app/controller/AdminUser.php index f31dfb0..4948627 100644 --- a/app/controller/AdminUser.php +++ b/app/controller/AdminUser.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use think\facade\Cache; use think\facade\Db; use think\facade\Request; @@ -12,6 +13,8 @@ use app\model\AdminUser as AdminModel; class AdminUser extends BaseController { + protected $middleware = [CheckAdmin::class]; + protected $relationType = [1 => '用户', 2 => '代理']; /** @@ -120,6 +123,14 @@ class AdminUser extends BaseController Db::query("TRUNCATE TABLE {$tableName}"); } + $login_user_data = Cache::store('redis')->get('login_user_data'); + if ($login_user_data) Cache::store('redis')->delete('login_admin_user_data'); + $login_agent_user_data = Cache::store('redis')->get('login_agent_user_data'); + if ($login_agent_user_data) Cache::store('redis')->delete('login_agent_user_data'); + $login_admin_user_data = Cache::store('redis')->get('login_admin_user_data'); + if ($login_admin_user_data) Cache::store('redis')->delete('login_admin_user_data'); + + return $this->renderSuccess('已清除成功'); } diff --git a/app/controller/AdminUserTeam.php b/app/controller/AdminUserTeam.php index bc27e8b..c5c0d7e 100644 --- a/app/controller/AdminUserTeam.php +++ b/app/controller/AdminUserTeam.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\RechargeRecords; @@ -19,6 +20,8 @@ use think\exception\ValidateException; class AdminUserTeam extends BaseController { + protected $middleware = [CheckAdmin::class]; + /** * 获取用户列表 * @return array diff --git a/app/controller/AdminZoneManage.php b/app/controller/AdminZoneManage.php index dc71dbf..85da053 100644 --- a/app/controller/AdminZoneManage.php +++ b/app/controller/AdminZoneManage.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\ZoneGoods; use app\model\ZoneGoodsParam; use app\validate\Zone as ZoneValidate; @@ -13,6 +14,8 @@ use think\facade\Request; class AdminZoneManage extends BaseController { + protected $middleware = [CheckAdmin::class]; + /** * 刮奖专区列表 * @return array diff --git a/app/controller/AgentTeam.php b/app/controller/AgentTeam.php index 244579b..c423e3f 100644 --- a/app/controller/AgentTeam.php +++ b/app/controller/AgentTeam.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAgent; use app\model\AgentDownScoresRecords; use app\model\AgentUpScoresRecords; use app\model\AgentUser; @@ -20,6 +21,8 @@ use think\facade\Request; class AgentTeam extends BaseController { + protected $middleware = [CheckAgent::class]; + /** * 获取用户列表 * @return array @@ -201,6 +204,74 @@ class AgentTeam extends BaseController ]); } + /** + * 上分记录 + * @return array + * @throws \think\db\exception\DbException + */ + public function upScoresList() + { + $agentData = $this->request->userInfo; + + $data = Request::param(); + + $limit = $data['limit'] ?: 10; + + $list = Db::name('agent_recharge_records') + ->where('aid',$agentData['id']) + ->field('user_id,withdrawal_amount,withdrawal_balance,create_time') + ->order('id' ,'desc') + ->paginate($limit); + + $listArr = $list->items(); + + foreach ($listArr as &$item) { + $item['relation_id'] = $item['user_id']; + give_symbol($item['withdrawal_amount'],'-'); + $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time'])); + unset($item['user_id']); + } + + return $this->renderSuccess('数据获取成功',[ + 'list' => $listArr, + 'total' => $list->total() + ]); + } + + /** + * 下分记录 + * @return array + * @throws \think\db\exception\DbException + */ + public function downScoresList() + { + $agentData = $this->request->userInfo; + + $data = Request::param(); + + $limit = $data['limit'] ?: 10; + + $list = Db::name('agent_down_scores_records') + ->where('aid',$agentData['id']) + ->field('user_id,balance,residue_amount,create_time') + ->order('id' ,'desc') + ->paginate($limit); + + $listArr = $list->items(); + + foreach ($listArr as &$item) { + $item['relation_id'] = $item['user_id']; + give_symbol($item['balance']); + $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time'])); + unset($item['user_id']); + } + + return $this->renderSuccess('数据获取成功',[ + 'list' => $listArr, + 'total' => $list->total() + ]); + } + /** * 退出登陆 diff --git a/app/controller/CustomerService.php b/app/controller/CustomerService.php index 2630bb1..bbd0d70 100644 --- a/app/controller/CustomerService.php +++ b/app/controller/CustomerService.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\CustomerService as CustomerServiceModel; use app\validate\CustomerService as CustomerServiceValidate; use think\exception\ValidateException; @@ -12,6 +13,8 @@ use think\facade\Request; class CustomerService extends BaseController { + protected $middleware = [CheckAdmin::class]; + /** * 显示资源列表 */ diff --git a/app/controller/Index.php b/app/controller/Index.php index ca909dc..9678960 100644 --- a/app/controller/Index.php +++ b/app/controller/Index.php @@ -2,6 +2,7 @@ namespace app\controller; use app\BaseController; +use app\middleware\CheckUser; use app\model\AwardsRecords; use app\model\Notice; use app\model\RotationChart; @@ -12,6 +13,12 @@ use think\facade\Request; class Index extends BaseController { + protected $middleware = [ + CheckUser::class => [ + 'only' => ['getNoticeInfo'] + ] + ]; + /** * 轮播图 */ diff --git a/app/controller/Notice.php b/app/controller/Notice.php index e9ad710..4c05eea 100644 --- a/app/controller/Notice.php +++ b/app/controller/Notice.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; +use app\middleware\CheckAdmin; use app\model\Notice as NoticeModel; use app\validate\Notice as NoticeValidate; use think\exception\ValidateException; @@ -11,6 +12,9 @@ use think\facade\Request; class Notice extends BaseController { + + protected $middleware = [CheckAdmin::class]; + /** * 显示资源列表 */ diff --git a/app/controller/RotationChart.php b/app/controller/RotationChart.php index 2005f26..5bca9a9 100644 --- a/app/controller/RotationChart.php +++ b/app/controller/RotationChart.php @@ -5,6 +5,7 @@ namespace app\controller; use app\BaseController; use app\logic\Upload; +use app\middleware\CheckAdmin; use app\model\RotationChart as RotationChartModel; use app\validate\RotationChart as RotationChartValidate; use think\exception\ValidateException; @@ -13,6 +14,9 @@ use think\facade\Request; class RotationChart extends BaseController { + + protected $middleware = [CheckAdmin::class]; + /** * 显示资源列表 */ diff --git a/app/controller/User.php b/app/controller/User.php index f9af92d..dd6358d 100644 --- a/app/controller/User.php +++ b/app/controller/User.php @@ -2,6 +2,7 @@ namespace app\controller; use app\BaseController; +use app\middleware\CheckUser; use app\model\CustomerService as CustomerServiceModel; use app\model\User as UserModel; use app\validate\User as UserValidate; @@ -13,6 +14,8 @@ use think\facade\Request; class User extends BaseController { + protected $middleware = [CheckUser::class]; + /** * 找回密码 * @return array diff --git a/app/controller/Zone.php b/app/controller/Zone.php index 4da1f7f..4ddb6b6 100644 --- a/app/controller/Zone.php +++ b/app/controller/Zone.php @@ -3,6 +3,7 @@ namespace app\controller; use app\BaseController; +use app\middleware\CheckUser; use app\model\ConsumptionRecords; use app\model\Zone as ZoneModel; use app\model\ZoneGoods; @@ -16,6 +17,8 @@ use think\facade\Session; class Zone extends BaseController { + protected $middleware = [CheckUser::class]; + /** * 首页专区列表 * @return array diff --git a/app/logic/InitData.php b/app/logic/InitData.php index 4f6bff9..e115b09 100644 --- a/app/logic/InitData.php +++ b/app/logic/InitData.php @@ -34,12 +34,12 @@ class InitData $defaultArr = [ ['amount' => '10.00', 'weight' => 10], - ['amount' => '20.00', 'weight' => 20], + ['amount' => '20.00', 'weight' => 10], ['amount' => '30.00', 'weight' => 10], - ['amount' => '50.00', 'weight' => 50], - ['amount' => '100.00', 'weight' => 40], - ['amount' => '500.00', 'weight' => 30], - ['amount' => '1000.00', 'weight' => 20], + ['amount' => '50.00', 'weight' => 10], + ['amount' => '100.00', 'weight' => 10], + ['amount' => '500.00', 'weight' => 10], + ['amount' => '1000.00', 'weight' => 10], ['amount' => '100000.00', 'weight' => 10], ['amount' => '1000000.00', 'weight' => 1], ]; diff --git a/route/app.php b/route/app.php index 9b27b18..d8e09e3 100644 --- a/route/app.php +++ b/route/app.php @@ -9,122 +9,9 @@ // | Author: liu21st // +---------------------------------------------------------------------- use think\facade\Route; -use app\middleware\CheckUser; -use app\middleware\CheckAgent; -use app\middleware\CheckAdmin; -# 登陆注册 -Route::group('passport',function (){ - Route::post('register','passport/register'); - Route::post('login','passport/login'); - Route::post('retrieve','passport/retrieve'); - Route::post('changeCaptcha','passport/changeCaptcha'); - Route::post('sendCode','passport/sendCode'); - Route::post('adminLogin','passport/adminLogin'); - Route::post('agentLogin','passport/agentLogin'); +Route::get('think', function () { + return 'hello,ThinkPHP6!'; }); -# 用户 -Route::group('index',function () { - Route::post('awardRecords','index/awardRecords'); - Route::post('rotationChart','index/rotationChart'); - Route::post('zoneList','index/zoneList'); - Route::post('getNotice','index/getNotice'); - Route::post('getNoticeInfo','index/getNoticeInfo')->middleware(CheckUser::class); -}); - -Route::group('user',function (){ - Route::rule('modifyPassword','user/modifyPassword'); - Route::rule('withdrawalRecords','user/withdrawalRecords'); - Route::rule('rechargeRecords','user/rechargeRecords'); - Route::rule('consumptionRecords','user/consumptionRecords'); - Route::rule('awardsRecords','user/awardsRecords'); - Route::rule('userInfo','user/userInfo'); - Route::rule('logOut','user/logOut'); -})->middleware(CheckUser::class); - -Route::group('zone',function(){ - #Route::post('zoneList','zone/zoneList'); - Route::post('zoneGoodsList','zone/zoneGoodsList'); - Route::post('beginLottery','zone/beginLottery'); - Route::post('endLottery','zone/endLottery'); - Route::post('queryAwardsResult','zone/queryAwardsResult'); - Route::post('beginInitInfo','zone/beginInitInfo'); -})->middleware(CheckUser::class); - -# 代理 -Route::group('agentTeam',function(){ - Route::post('userList','agentTeam/userList'); - Route::post('upScores','agentTeam/upScores'); - Route::post('downScores','agentTeam/downScores'); - Route::post('getAgentInviteCode','agentTeam/getAgentInviteCode'); - Route::post('getAgentUserInfo','agentTeam/getAgentUserInfo'); - Route::post('logOut','agentTeam/logOut'); -})->middleware(CheckAgent::class); - -# 总后台 -Route::group('adminStatistics',function() { - Route::post('needStatistics','adminStatistics/needStatistics'); - Route::post('userStatistics','adminStatistics/userStatistics'); - Route::post('upAndDownStatistics','adminStatistics/upAndDownStatistics'); -})->middleware(CheckAdmin::class); - -Route::group('adminUserTeam',function() { - Route::post('userList','adminUserTeam/userList'); - Route::post('editUser','adminUserTeam/editUser'); - Route::post('deleteUser','adminUserTeam/deleteUser'); - Route::post('upScores','adminUserTeam/upScores'); - Route::post('downScores','adminUserTeam/downScores'); - Route::post('addUser','adminUserTeam/addUser'); -})->middleware(CheckAdmin::class); - -Route::group('adminAgentTeam',function() { - Route::post('agentList','adminAgentTeam/agentList'); - Route::post('agentUpScores','adminAgentTeam/agentUpScores'); - Route::post('agentDownScores','adminAgentTeam/agentDownScores'); - Route::post('editAgent','adminAgentTeam/editAgent'); - Route::post('deleteAgent','adminAgentTeam/deleteAgent'); - Route::post('addAgent','adminAgentTeam/addAgent'); -})->middleware(CheckAdmin::class); - -Route::group('adminUser',function() { - Route::post('userInfo','adminUser/userInfo'); - Route::post('upScoresList','adminUser/upScoresList'); - Route::post('downScoresList','adminUser/downScoresList'); - Route::post('logOut','adminUser/logOut'); -})->middleware(CheckAdmin::class); - -Route::group('adminZoneManage',function() { - Route::post('zoneGoodsList','adminZoneManage/zoneGoodsList'); - Route::post('zoneGoodsChangeStatus','adminZoneManage/zoneGoodsChangeStatus'); - Route::post('goodsParamList','adminZoneManage/goodsParamList'); - Route::post('goodsParamSave','adminZoneManage/goodsParamSave'); - Route::post('goodsParamDel','adminZoneManage/goodsParamDel'); -})->middleware(CheckAdmin::class); - -Route::group('customerService',function() { - Route::post('list','customerService/list'); - Route::post('save','customerService/save'); - Route::post('delete','customerService/delete'); -})->middleware(CheckAdmin::class); - -Route::group('notice',function() { - Route::post('list','notice/list'); - Route::post('save','notice/save'); - Route::post('delete','notice/delete'); -})->middleware(CheckAdmin::class); - -Route::group('rotationChart',function() { - Route::post('list','rotationChart/list'); - Route::post('save','rotationChart/save'); - Route::post('delete','rotationChart/delete'); - Route::post('upload','rotationChart/upload'); -})->middleware(CheckAdmin::class); - - -# 支付（待开发） -//Route::group('pay',function (){ -// Route::post('pay','pay/pay'); -// Route::post('notify','pay/notify'); -// Route::post('return','pay/return'); -//}); +Route::get('hello/:name', 'index/hello');