From 182bb11bfd4f3a135b4d290f3a79a8a12e93489f Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 19 Jan 2022 14:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Forms/AfterSaleVerify.php | 1 + app/Models/DealerEarning.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Admin/Forms/AfterSaleVerify.php b/app/Admin/Forms/AfterSaleVerify.php index 75ded9a4..259fcd43 100644 --- a/app/Admin/Forms/AfterSaleVerify.php +++ b/app/Admin/Forms/AfterSaleVerify.php @@ -44,6 +44,7 @@ class AfterSaleVerify extends Form implements LazyRenderable if ($input['state'] == 3) {//审核通过 $amount = Arr::get($input, 'amount', 0); $afterSale->load(['order', 'order.afterSales']); + //已完成的售后单 $finishedAfterSale = $afterSale->order->afterSales->filter(function ($items) { if ($items->state == AfterSale::STATE_FINISH && in_array($items->type, [AfterSale::TYPE_REFUND_AND_RETURN, AfterSale::TYPE_REFUND, Aftersale::TYPE_CHANGE])) { return true; diff --git a/app/Models/DealerEarning.php b/app/Models/DealerEarning.php index 616076ca..e6eaed96 100644 --- a/app/Models/DealerEarning.php +++ b/app/Models/DealerEarning.php @@ -124,7 +124,7 @@ class DealerEarning extends Model public function getStatusNameAttribute() { if ($this->settle_at) { - return $this->status::text(); + return $this->status->text(); } else { return '待结算'; }