From 04265c45a59d0dc2b998881808831a0d28c3152d Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 6 Jan 2022 17:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=84=E6=94=B6=E7=9B=8A?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Http/Controllers/Account/WalletController.php         | 4 +++-
 .../Api/Http/Resources/DistributionPreIncomeResource.php      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php
index ec18965c..58ba48bf 100644
--- a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php
+++ b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php
@@ -54,9 +54,11 @@ class WalletController extends Controller
     public function distributionLogs(Request $request)
     {
         $perPage = PaginatorHelper::resolvePerPage('per_page', 20, 50);
+        // $sort = $request-
         $distributionLogs = $request->user()->distributionPreIncomes()
                                     ->with('logs')
-                                    ->unsettlement()
+                                    ->where('created_at', '>', now()->subDays(30))
+                                    // ->unsettlement()
                                     ->latest('id')
                                     ->simplePaginate($perPage);
 
diff --git a/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php b/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php
index 562a3a18..1445fb90 100644
--- a/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php
+++ b/app/Endpoint/Api/Http/Resources/DistributionPreIncomeResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Endpoint\Api\Http\Resources;
 
+use App\Models\DistributionPreIncome;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class DistributionPreIncomeResource extends JsonResource
@@ -19,6 +20,7 @@ class DistributionPreIncomeResource extends JsonResource
             'logs'      => DistributionPreIncomeLogResource::collection($this->whenLoaded('logs')),
             'created_at'=> $this->created_at->format('y-m-d H:i'),
             'total_revenue' => $this->total_revenue,
+            'status'    => DistributionPreIncome::$statusTexts[$this->status],
         ];
     }
 }