From 4082740b1cfcfe2ac96344a5dffed1762c8a10d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Fri, 25 Mar 2022 09:29:06 +0800 Subject: [PATCH] Fix --- .../Api/Http/Controllers/Dealer/UserController.php | 1 + app/Models/Dealer.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php index 5f78bab4..ad257c8f 100644 --- a/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php +++ b/app/Endpoint/Api/Http/Controllers/Dealer/UserController.php @@ -40,6 +40,7 @@ class UserController extends Controller $calculateManageSubsidiesOfCurrentPeriod->handle($user->dealer), 2 ); + $dealerResource['archived_purchase_amount'] = $user->dealer->archived_purchase_amount; $dealerResource['total_purchase_amount'] = bcadd( $calculateUnsettledPurchaseAmount->handle($user->dealer), $calculatePurchaseAmountOfCurrentPeriod->handle($user->dealer), diff --git a/app/Models/Dealer.php b/app/Models/Dealer.php index 58f2cc0c..e7c0a696 100644 --- a/app/Models/Dealer.php +++ b/app/Models/Dealer.php @@ -6,6 +6,7 @@ use App\Casts\JsonArray; use App\Enums\DealerLvl; use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Cache; class Dealer extends Model { @@ -315,6 +316,18 @@ class Dealer extends Model } } + /** + * 获取已结算的进货业绩 + * + * @return string + */ + public function getArchivedPurchaseAmountAttribute() + { + return Cache::remember('dealer_archived_purchase_amount:'.$this->user_id, 3600, function () { + return $this->purchaseSubsidies()->sum('total_purchase_amount'); + }); + } + public function canWithdraw() { return true;