diff --git a/app/data/controller/user/Admin.php b/app/data/controller/user/Admin.php index d4217083e..76c5177ac 100644 --- a/app/data/controller/user/Admin.php +++ b/app/data/controller/user/Admin.php @@ -105,7 +105,7 @@ class Admin extends Controller $map = $this->_vali(['id.require' => '用户ID不能为空!']); $user = $this->app->db->name($this->table)->where($map)->find(); if (empty($user) || empty($user['pid0'])) $this->error('用户不符合操作要求!'); - [$status, $message] = UserUpgradeService::instance()->bindAgent($user['id'], $user['pid0'], 1); + [$status, $message] = UserUpgradeService::instance()->bindAgent($user['id'], $user['pid0']); $status && sysoplog('前端用户管理', "后台修改用户[{$map['id']}]的代理为永久状态"); empty($status) ? $this->error($message) : $this->success($message); } diff --git a/app/data/controller/user/Transfer.php b/app/data/controller/user/Transfer.php index 4f739a4dc..815d73417 100644 --- a/app/data/controller/user/Transfer.php +++ b/app/data/controller/user/Transfer.php @@ -65,7 +65,7 @@ class Transfer extends Controller * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - private function _sysdata($tpl = '') + private function _sysdata(string $tpl = '') { if ($this->request->isGet()) { $this->data = sysdata($this->skey); diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php index b85bf9513..5745bf6c5 100644 --- a/app/data/service/OrderService.php +++ b/app/data/service/OrderService.php @@ -58,7 +58,7 @@ class OrderService extends Service // 尝试绑定代理用户 if (empty($user['pids']) && ($order['puid1'] > 0 || $user['pid1'] > 0)) { $puid1 = $order['puid1'] > 0 ? $order['puid1'] : $user['pid0']; - UserUpgradeService::instance()->bindAgent($user['id'], $puid1, 1); + UserUpgradeService::instance()->bindAgent($user['id'], $puid1); } // 重置用户信息并绑定订单 $user = $this->app->db->name('DataUser')->where(['id' => $order['uid']])->find(); diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php index d36fbcd62..e80fc2a14 100644 --- a/app/data/service/UserUpgradeService.php +++ b/app/data/service/UserUpgradeService.php @@ -65,7 +65,7 @@ class UserUpgradeService extends Service } } // 更新用户等级 - $this->upgrade($user['id'], true); + $this->upgrade($user['id']); $result = [1, '绑定代理成功']; }); return $result; diff --git a/app/data/service/payment/JoinpayPaymentService.php b/app/data/service/payment/JoinpayPaymentService.php index 88794df4e..bc71afa14 100644 --- a/app/data/service/payment/JoinpayPaymentService.php +++ b/app/data/service/payment/JoinpayPaymentService.php @@ -163,7 +163,7 @@ class JoinpayPaymentService extends PaymentService protected function initialize(): JoinpayPaymentService { $this->appid = $this->params['joinpay_appid']; - $this->trade = $this->params['joinpay_trade'];; + $this->trade = $this->params['joinpay_trade']; $this->mchid = $this->params['joinpay_mch_id']; $this->mchkey = $this->params['joinpay_mch_key']; return $this; diff --git a/vendor/services.php b/vendor/services.php index bab675978..ef85927ee 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library',