From 647adeefbecaf5691ebeb4c560fad807068b0940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com>
Date: Mon, 16 Dec 2024 14:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8=E5=92=8C?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=B7=B2=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Controller.php                   |  2 +-
 .../Controllers/Message/WebsiteMessageController.php  | 11 +++++++++++
 .../Controllers/Supplier/PurchaseRecordController.php |  5 +++++
 routes/api.php                                        |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index f735986..a62a3c9 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -48,7 +48,7 @@ class Controller extends BaseController
         return $this->log->add($targetId, $targetField);
     }
 
-    public function success($data, $msg = "")
+    public function success($data=[], $msg = "")
     {
         return [
             "success" => true,
diff --git a/app/Http/Controllers/Message/WebsiteMessageController.php b/app/Http/Controllers/Message/WebsiteMessageController.php
index 792949c..e710fb8 100644
--- a/app/Http/Controllers/Message/WebsiteMessageController.php
+++ b/app/Http/Controllers/Message/WebsiteMessageController.php
@@ -74,4 +74,15 @@ class WebsiteMessageController extends Controller
         }
     }
 
+    public function batchRead(Request $request)
+    {
+        $params = $request->validate([
+            'ids' => 'required|array'
+        ], [
+            'ids.required' => '需要操作的ids'
+        ]);
+        WebsiteMessages::query()->whereIn('id', $params['ids'])->update(['status' => 1]);
+        return $this->success();
+    }
+
 }
diff --git a/app/Http/Controllers/Supplier/PurchaseRecordController.php b/app/Http/Controllers/Supplier/PurchaseRecordController.php
index aa341ce..b57f882 100644
--- a/app/Http/Controllers/Supplier/PurchaseRecordController.php
+++ b/app/Http/Controllers/Supplier/PurchaseRecordController.php
@@ -48,6 +48,11 @@ class PurchaseRecordController extends Controller
         if (!empty($request->start_time) && !empty($request->end_time)) {
             $builder->whereBetween('created_at', [$request->start_time, $request->end_time]);
         }
+        if (!empty($request->date_start_time) && !empty($request->date_end_time)) {
+            $dateStart = Carbon::parse($request->date_start_time)->toDateString();
+            $dateEnd = Carbon::parse($request->date_end_time)->subDay()->toDateString();
+            $builder->whereBetween('date', [$dateStart, $dateEnd]);
+        }
         if (!empty($request->title)) {
             $builder->whereHas('goodsSku', function ($query) use ($request) {
                 $query->where('name', 'like', '%' . $request->title . '%');
diff --git a/routes/api.php b/routes/api.php
index ff3fc48..a6177a3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -81,6 +81,8 @@ Route::middleware(['auth:api', 'check.permissions'])->group(function () {
     Route::resource('supplier', 'Supplier\SuppliersController', ['only' => ['index', 'update', 'store','destroy']]);
     //站内信
     Route::resource('website_message', 'Message\WebsiteMessageController', ['only' => ['index', 'update']]);
+    Route::post('website_message/batchRead', [\App\Http\Controllers\Message\WebsiteMessageController::class, 'batchRead']);
+
     //仓库管理-采购单
     Route::resource('supplier/purchase_record', 'Supplier\PurchaseRecordController',['only' => ['index', 'store','update']]);
     //报损单