From 135f9ee7fa4f4892f4abbcf2910f2a4a38d84953 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 19 Jan 2022 10:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E9=87=91=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=8A=B6=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/Http/Resources/Dealer/DealerEarningResource.php | 2 +- .../Api/Http/Resources/Dealer/DealerEarningSimpleResource.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningResource.php index 31469c46..1508d961 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningResource.php @@ -22,7 +22,7 @@ class DealerEarningResource extends JsonResource 'fee_rate' => $this->fee_rate, 'fee' => $this->fee, 'total_earnings'=> $this->total_earnings, - 'status' => $this->status, + 'status' => $this->settle_at ? $this->status : -1, 'status_name' => $this->status_name, 'remark' => $this->remark, 'pay_info' => $this->getPayInfo(), diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php index 57fe6945..a1f0cacb 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php @@ -19,7 +19,7 @@ class DealerEarningSimpleResource extends JsonResource 'type' => $this->type_name, 'created_at' => $this->created_at->toDateTimeString(), 'total_earnings'=> $this->total_earnings, - 'status' => $this->status, + 'status' => $this->settle_at ? $this->status : -1, 'status_name' => $this->status_name, // 'settle_at' ];