From 78b2c8ed5f61c293016e5dc764fbfd4f85a342a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Wed, 23 Mar 2022 13:37:43 +0800 Subject: [PATCH] Update --- .../Api/Http/Controllers/Dealer/ManageSubsidyLogController.php | 2 +- .../Http/Resources/Dealer/DealerManageSubsidyLogResource.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php index 2423786b..098742fe 100644 --- a/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php +++ b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php @@ -22,7 +22,7 @@ class ManageSubsidyLogController extends Controller $perPage = Paginator::resolvePerPage('per_page', 20, 50); - $manageSubsidyLogs = DealerManageSubsidyLog::with(['product']) + $manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order']) ->when($isComplted, function ($query) { $tz = now(); diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerManageSubsidyLogResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerManageSubsidyLogResource.php index c49997a6..3f2e7542 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/DealerManageSubsidyLogResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerManageSubsidyLogResource.php @@ -15,6 +15,7 @@ class DealerManageSubsidyLogResource extends JsonResource public function toArray($request) { return [ + 'order' => OrderSimpleResource::make($this->whenLoaded('order')), 'product' => ProductSimpleResource::make($this->whenLoaded('product')), 'sales_volume' => $this->sales_volume, 'total_amount' => $this->total_amount,