From 56462f8530a0d5c4fe1a14b13264436530f50c85 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Feb 2022 11:18:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E9=87=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8N+1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Http/Resources/Dealer/DealerEarningSimpleResource.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php
index adbc0265..6117815c 100644
--- a/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php
+++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerEarningSimpleResource.php
@@ -22,7 +22,7 @@ class DealerEarningSimpleResource extends JsonResource
             'status'        => $this->status_format,
             'status_name'   => $this->status_name,
             'is_payer'      => $this->payer_id ? ($this->payer_id == $request->user()->id) : false,
-            'beneficiary_phone' => $this->user?->phone ?? '',
+            'beneficiary_phone' => (string) $this->whenLoaded('user', $this->user->phone, ''),
             // 'settle_at'
         ];
     }

From e083de9df32c7e23d3223015734d3cd1cbcf682d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Wed, 23 Feb 2022 11:41:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=9B=E8=B4=A7=E8=A1=A5=E8=B4=B4?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dealer/PurchaseSubsidyLogController.php   | 28 +++++++++++++++++++
 .../DealerPurchaseSubsidyLogResource.php      | 22 +++++++++++++++
 app/Endpoint/Api/routes.php                   |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 app/Endpoint/Api/Http/Controllers/Dealer/PurchaseSubsidyLogController.php
 create mode 100644 app/Endpoint/Api/Http/Resources/Dealer/DealerPurchaseSubsidyLogResource.php

diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/PurchaseSubsidyLogController.php b/app/Endpoint/Api/Http/Controllers/Dealer/PurchaseSubsidyLogController.php
new file mode 100644
index 00000000..c0f97cb6
--- /dev/null
+++ b/app/Endpoint/Api/Http/Controllers/Dealer/PurchaseSubsidyLogController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Controllers\Dealer;
+
+use App\Endpoint\Api\Http\Controllers\Controller;
+use App\Endpoint\Api\Http\Resources\Dealer\DealerPurchaseSubsidyLogResource;
+use App\Models\DealerPurchaseSubsidy;
+use Illuminate\Http\Request;
+
+class PurchaseSubsidyLogController extends Controller
+{
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return void
+     */
+    public function index($id, Request $request)
+    {
+        $purchaseSubsidy = DealerPurchaseSubsidy::settleCompleted()->where('user_id', $request->user()->id)->find($id);
+
+        if ($purchaseSubsidy) {
+            return DealerPurchaseSubsidyLogResource::collection(
+                $purchaseSubsidy->logs()->oldest('id')->get()
+            );
+        }
+
+        return response()->json([]);
+    }
+}
diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerPurchaseSubsidyLogResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerPurchaseSubsidyLogResource.php
new file mode 100644
index 00000000..22901450
--- /dev/null
+++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerPurchaseSubsidyLogResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Resources\Dealer;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DealerPurchaseSubsidyLogResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return [
+            'change_amount' => $this->change_amount,
+            'remark' => $this->remark,
+        ];
+    }
+}
diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php
index 3b3a8043..cb939393 100644
--- a/app/Endpoint/Api/routes.php
+++ b/app/Endpoint/Api/routes.php
@@ -287,5 +287,7 @@ Route::group([
 
         // 进货补贴
         Route::get('purchase-subsidies', [Dealer\PurchaseSubsidyController::class, 'index']);
+        // 进货补贴流水
+        Route::get('purchase-subsidies/{purchase_subsidy}/logs', [Dealer\PurchaseSubsidyLogController::class, 'index']);
     });
 });