From 4435dcf61ac7c2ab1e888f94b349f9b739065428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 30 Apr 2022 17:24:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=89=E7=BA=A7=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/api/auth/Center.php | 9 ++------- app/data/controller/base/Discount.php | 3 ++- app/data/controller/shop/Goods.php | 3 ++- app/data/controller/user/Admin.php | 7 ++++--- app/data/controller/user/Balance.php | 5 +++-- app/data/controller/user/Rebate.php | 3 ++- app/data/model/BaseUserUpgrade.php | 5 +---- app/data/service/UserUpgradeService.php | 12 +----------- 8 files changed, 17 insertions(+), 30 deletions(-) diff --git a/app/data/controller/api/auth/Center.php b/app/data/controller/api/auth/Center.php index b03431684..46e007f62 100644 --- a/app/data/controller/api/auth/Center.php +++ b/app/data/controller/api/auth/Center.php @@ -3,6 +3,7 @@ namespace app\data\controller\api\auth; use app\data\controller\api\Auth; +use app\data\model\BaseUserUpgrade; use app\data\model\DataUser; use app\data\service\RebateService; use app\data\service\UserAdminService; @@ -102,13 +103,7 @@ class Center extends Auth */ public function levels() { - $levels = UserUpgradeService::instance()->levels(); - foreach ($levels as &$level) { - $level['prizes'] = []; - foreach (str2arr($level['rebate_rule']) as $code) { - $level['prizes'][$code] = RebateService::instance()->name($code); - } - } + $levels = BaseUserUpgrade::items(); $this->success('获取用户等级', array_values($levels)); } diff --git a/app/data/controller/base/Discount.php b/app/data/controller/base/Discount.php index 6ce742207..e8f470cda 100644 --- a/app/data/controller/base/Discount.php +++ b/app/data/controller/base/Discount.php @@ -3,6 +3,7 @@ namespace app\data\controller\base; use app\data\model\BaseUserDiscount; +use app\data\model\BaseUserUpgrade; use app\data\service\UserUpgradeService; use think\admin\Controller; use think\admin\helper\QueryHelper; @@ -64,7 +65,7 @@ class Discount extends Controller } $vo['items'] = json_encode($rule, JSON_UNESCAPED_UNICODE); } else { - $this->levels = UserUpgradeService::levels(); + $this->levels = BaseUserUpgrade::items(); if (empty($this->levels)) $this->error('未配置用户等级！'); foreach ($vo['items'] ?? [] as $item) { $vo["_level_{$item['level']}"] = $item['discount']; diff --git a/app/data/controller/shop/Goods.php b/app/data/controller/shop/Goods.php index 0d172f6c8..3435160e3 100644 --- a/app/data/controller/shop/Goods.php +++ b/app/data/controller/shop/Goods.php @@ -4,6 +4,7 @@ namespace app\data\controller\shop; use app\data\model\BaseUserDiscount; use app\data\model\BaseUserPayment; +use app\data\model\BaseUserUpgrade; use app\data\model\ShopGoods; use app\data\model\ShopGoodsCate; use app\data\model\ShopGoodsItem; @@ -138,7 +139,7 @@ class Goods extends Controller $this->marks = ShopGoodsMark::items(); $this->cates = ShopGoodsCate::treeTable(true); $this->trucks = ExpressService::instance()->templates(); - $this->upgrades = UserUpgradeService::instance()->levels(); + $this->upgrades = BaseUserUpgrade::items(); $this->payments = BaseUserPayment::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('type,code,name', 'code'); $this->discounts = BaseUserDiscount::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('id,name,items', 'id'); // 商品规格处理 diff --git a/app/data/controller/user/Admin.php b/app/data/controller/user/Admin.php index afb400dbf..d8fa0194d 100644 --- a/app/data/controller/user/Admin.php +++ b/app/data/controller/user/Admin.php @@ -2,6 +2,7 @@ namespace app\data\controller\user; +use app\data\model\BaseUserUpgrade; use app\data\model\DataUser; use app\data\service\UserAdminService; use app\data\service\UserUpgradeService; @@ -25,7 +26,7 @@ class Admin extends Controller public function index() { // 用户等级分组 - [$ts, $ls] = [[], UserUpgradeService::instance()->levels()]; + [$ts, $ls] = [[], BaseUserUpgrade::items()]; $ts['ta'] = ['vip' => '', 'name' => '全部用户', 'count' => 0]; foreach ($ls as $k => $v) $ts["t{$k}"] = ['vip' => $k, 'name' => $v['name'], 'count' => 0,]; $ts['to'] = ['vip' => '', 'name' => '其他用户', 'count' => 0]; @@ -62,7 +63,7 @@ class Admin extends Controller */ protected function _page_filter(array &$data) { - $this->upgrades = UserUpgradeService::instance()->levels(); + $this->upgrades = BaseUserUpgrade::items(); UserAdminService::instance()->buildByUid($data, 'pid1', 'from'); } @@ -139,7 +140,7 @@ class Admin extends Controller public function parent() { if ($this->request->isGet()) { - $this->upgrades = UserUpgradeService::instance()->levels(); + $this->upgrades = BaseUserUpgrade::items(); $data = $this->_vali(['uuid.require' => '待操作UID不能为空！']); // 排除下级用户 diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php index 971c7ba2f..cd6df6271 100644 --- a/app/data/controller/user/Balance.php +++ b/app/data/controller/user/Balance.php @@ -2,6 +2,7 @@ namespace app\data\controller\user; +use app\data\model\BaseUserUpgrade; use app\data\model\DataUser; use app\data\model\DataUserBalance; use app\data\service\UserAdminService; @@ -52,7 +53,7 @@ class Balance extends Controller UserAdminService::instance()->buildByUid($data); $uids = array_unique(array_column($data, 'create_by')); $users = SystemUser::mk()->whereIn('id', $uids)->column('username', 'id'); - $this->upgrades = UserUpgradeService::instance()->levels(); + $this->upgrades = BaseUserUpgrade::items(); foreach ($data as &$vo) { $vo['upgradeinfo'] = $this->upgrades[$vo['upgrade']] ?? []; $vo['create_byname'] = $users[$vo['create_by']] ?? ''; @@ -84,7 +85,7 @@ class Balance extends Controller $data['code'] = CodeExtend::uniqidDate('20', 'B'); } if ($this->request->isGet()) { - $this->upgrades = UserUpgradeService::instance()->levels(); + $this->upgrades = BaseUserUpgrade::items(); } if ($this->request->isPost()) { $data['create_by'] = AdminService::instance()->getUserId(); diff --git a/app/data/controller/user/Rebate.php b/app/data/controller/user/Rebate.php index 30a330ce7..bef2cca2c 100644 --- a/app/data/controller/user/Rebate.php +++ b/app/data/controller/user/Rebate.php @@ -2,6 +2,7 @@ namespace app\data\controller\user; +use app\data\model\BaseUserUpgrade; use app\data\model\DataUser; use app\data\model\DataUserRebate; use app\data\model\ShopOrderItem; @@ -83,7 +84,7 @@ class Rebate extends Controller $this->title = '用户返利配置'; if ($this->request->isGet()) { $this->data = sysdata($this->skey); - $this->levels = UserUpgradeService::instance()->levels(); + $this->levels = BaseUserUpgrade::items(); $this->fetch(); } else { sysdata($this->skey, $this->request->post()); diff --git a/app/data/model/BaseUserUpgrade.php b/app/data/model/BaseUserUpgrade.php index 2cdb0d5e5..c3545ada3 100644 --- a/app/data/model/BaseUserUpgrade.php +++ b/app/data/model/BaseUserUpgrade.php @@ -15,15 +15,12 @@ class BaseUserUpgrade extends Model /** * 获取用户等级 * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function items(): array { return static::mk()->where(['status' => 1]) ->hidden(['id', 'utime', 'status', 'create_at']) - ->order('number asc')->select()->toArray(); + ->order('number asc')->column('*', 'number'); } /** diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php index d9c829f6b..3a6aadbe0 100644 --- a/app/data/service/UserUpgradeService.php +++ b/app/data/service/UserUpgradeService.php @@ -17,16 +17,6 @@ use think\admin\Service; class UserUpgradeService extends Service { - /** - * 获取用户等级数据 - * @return array - */ - public static function levels(): array - { - $model = BaseUserUpgrade::mk()->where(['status' => 1]); - return $model->order('number asc')->column('*', 'number'); - } - /** * 尝试绑定上级代理 * @param integer $uuid 用户UID @@ -86,7 +76,7 @@ class UserUpgradeService extends Service $user = DataUser::mk()->where(['id' => $uuid])->find(); if (empty($user)) return true; // 初始化等级参数 - $levels = $this->levels(); + $levels = BaseUserUpgrade::items(); [$vipName, $vipCode, $vipTeam] = [$levels[0]['name'] ?? '普通用户', 0, []]; // 统计用户数据 foreach ($levels as $key => $level) if ($level['upgrade_team'] === 1) $vipTeam[] = $key;