From 14272c46b6ab420ef48b025f51002faff003ac50 Mon Sep 17 00:00:00 2001 From: "zhouhq@fxft.net" Date: Tue, 31 Mar 2020 14:24:28 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=AE=9A=E4=BB=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9Epackage=5Ftype=E5=AD=97=E6=AE=B5=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Services/PackageService.php | 2 +- app/Domains/Virtual/Services/PropertyService.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Domains/Virtual/Services/PackageService.php b/app/Domains/Virtual/Services/PackageService.php index 4559c6f9..a0b4afff 100644 --- a/app/Domains/Virtual/Services/PackageService.php +++ b/app/Domains/Virtual/Services/PackageService.php @@ -170,7 +170,7 @@ class PackageService extends Service { if (!self::$packages) { self::$packages = app(PackageRepository::class) - ->select(['id', 'type', 'sn', 'name', 'carrier_operator', 'flows', 'flowed', 'service_months', 'status']) + ->select(['id', 'type', 'sn', 'name', 'carrier_operator', 'flows', 'flowed', 'service_months', 'status','package_type']) ->withTrashed()->get()->keyBy('id')->toArray(); } diff --git a/app/Domains/Virtual/Services/PropertyService.php b/app/Domains/Virtual/Services/PropertyService.php index 21557ee1..879cf200 100644 --- a/app/Domains/Virtual/Services/PropertyService.php +++ b/app/Domains/Virtual/Services/PropertyService.php @@ -242,6 +242,7 @@ class PropertyService extends Service $item['package_name'] = $package['name'] ?? ''; $item['flows'] = $package['flows'] ?? 0; $item['carrier_operator'] = $package['carrier_operator']; + $item['package_type'] = $package['package_type']; $item['carrier_operator_name'] = $carrierOperators[$item['carrier_operator']] ?? '未知'; $property = $properties[$item['company_id'] . '_' . $item['package_id']]; $sell = $sells[$item['company_id'] . '_' . $item['package_id']];