Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x

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([]);
+    }
+}

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'
         ];
     }

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,
+        ];
+    }
+}

app/Endpoint/Api/routes.php

@@ -296,5 +296,7 @@ Route::group([
 
         // 进货补贴
         Route::get('purchase-subsidies', [Dealer\PurchaseSubsidyController::class, 'index']);
+        // 进货补贴流水
+        Route::get('purchase-subsidies/{purchase_subsidy}/logs', [Dealer\PurchaseSubsidyLogController::class, 'index']);
     });
 });