diff --git a/app/data/controller/news/Item.php b/app/data/controller/news/Item.php index 92af063f7..f476c0133 100644 --- a/app/data/controller/news/Item.php +++ b/app/data/controller/news/Item.php @@ -8,7 +8,6 @@ use app\data\service\NewsService; use think\admin\Controller; use think\admin\extend\CodeExtend; use think\admin\helper\QueryHelper; -use think\admin\model\SystemBase; /** * 文章内容管理 diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php index a55a26003..6a1c372da 100644 --- a/app/data/service/OrderService.php +++ b/app/data/service/OrderService.php @@ -136,7 +136,7 @@ class OrderService extends Service $items = $query->withoutField('id,uuid,status,deleted,create_at')->whereIn('order_no', $nobs)->select()->toArray(); // 关联用户数据 $fields = 'phone,username,nickname,headimg,status,vip_code,vip_name'; - if ($data) UserAdminService::instance()->buildByUid($data, 'uuid', 'user', $fields); + UserAdminService::instance()->buildByUid($data, 'uuid', 'user', $fields); if ($from) UserAdminService::instance()->buildByUid($data, 'puid1', 'from', $fields); foreach ($data as &$vo) { [$vo['sales'], $vo['truck'], $vo['items']] = [0, $trucks[$vo['order_no']] ?? [], []]; diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index 668341818..123aacc28 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -232,7 +232,7 @@ abstract class PaymentService */ public static function name(string $type): string { - return self::TYPES[$type]['name'] ?? $type; + return static::TYPES[$type]['name'] ?? $type; } /** @@ -243,7 +243,7 @@ abstract class PaymentService public static function getTypeAll(array $types = []): array { $binds = array_keys(UserAdminService::TYPES); - foreach (self::TYPES as $k => $v) if (isset($v['bind'])) { + foreach (static::TYPES as $k => $v) if (isset($v['bind'])) { if (array_intersect($v['bind'], $binds)) $types[$k] = $v; } return $types;