From 2cdefb1932c282dcacd0233e4d356c5c253da870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 8 May 2021 15:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/api/auth/Order.php | 2 +- app/data/service/PaymentService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index e2feb00d6..7c738eace 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -304,7 +304,7 @@ class Order extends Auth // 读取支付通道配置 $query = $this->app->db->name('BaseUserPayment')->where(['status' => 1, 'deleted' => 0]); $query->whereIn('code', str2arr($payments))->whereIn('type', PaymentService::getTypeApi($this->type)); - $result = $query->order('sort desc,id desc')->column('type,code,name,cover,content', 'code'); + $result = $query->order('sort desc,id desc')->column('type,code,name,cover,content,remark', 'code'); foreach ($result as &$vo) $vo['content'] = ['voucher_qrcode' => json_decode($vo['content'])->voucher_qrcode ?? '']; $this->success('获取支付参数数据', array_values($result)); } diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index 3d2b05169..31d1be410 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -254,7 +254,7 @@ abstract class PaymentService foreach (self::TYPES as $type => $attr) { if (in_array($api, $attr['bind'])) $types[] = $type; } - return $types; + return array_unique($types); } /**