优化代码

This commit is contained in:
邹景立 2022-04-30 17:34:06 +08:00
parent 2ac2f95e1f
commit d79b93b9e1
3 changed files with 3 additions and 4 deletions

View File

@ -8,7 +8,6 @@ use app\data\service\NewsService;
use think\admin\Controller; use think\admin\Controller;
use think\admin\extend\CodeExtend; use think\admin\extend\CodeExtend;
use think\admin\helper\QueryHelper; use think\admin\helper\QueryHelper;
use think\admin\model\SystemBase;
/** /**
* 文章内容管理 * 文章内容管理

View File

@ -136,7 +136,7 @@ class OrderService extends Service
$items = $query->withoutField('id,uuid,status,deleted,create_at')->whereIn('order_no', $nobs)->select()->toArray(); $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'; $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); if ($from) UserAdminService::instance()->buildByUid($data, 'puid1', 'from', $fields);
foreach ($data as &$vo) { foreach ($data as &$vo) {
[$vo['sales'], $vo['truck'], $vo['items']] = [0, $trucks[$vo['order_no']] ?? [], []]; [$vo['sales'], $vo['truck'], $vo['items']] = [0, $trucks[$vo['order_no']] ?? [], []];

View File

@ -232,7 +232,7 @@ abstract class PaymentService
*/ */
public static function name(string $type): string 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 public static function getTypeAll(array $types = []): array
{ {
$binds = array_keys(UserAdminService::TYPES); $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; if (array_intersect($v['bind'], $binds)) $types[$k] = $v;
} }
return $types; return $types;