From 139d3509f44973f8468fe7bf28b4f4d4362c0047 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Sat, 1 Nov 2025 09:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/FinReceiptController.php | 16 ++++++++++++++++
 app/common/model/FinReceipt.php                |  2 ++
 app/common/service/FinReceiptService.php       | 13 +++++++++++++
 config/route.php                               |  2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/common/controller/FinReceiptController.php b/app/common/controller/FinReceiptController.php
index cade259..aeca0eb 100644
--- a/app/common/controller/FinReceiptController.php
+++ b/app/common/controller/FinReceiptController.php
@@ -41,6 +41,22 @@ class FinReceiptController extends BaseController
         }
     }
 
+    /**
+     * 确认入账
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function delete(Request $request)
+    {
+        try {
+            $id = $request->input('id');
+            $raw = $this->service->delete($id);
+            return $this->success($raw);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
     public function show(Request $request)
     {
         try {
diff --git a/app/common/model/FinReceipt.php b/app/common/model/FinReceipt.php
index 88d3090..099697f 100644
--- a/app/common/model/FinReceipt.php
+++ b/app/common/model/FinReceipt.php
@@ -2,10 +2,12 @@
 
 namespace app\common\model;
 
+use Illuminate\Database\Eloquent\SoftDeletes;
 use support\Model;
 
 class FinReceipt extends Model
 {
+    use SoftDeletes;
     /**
      * The connection name for the model.
      *
diff --git a/app/common/service/FinReceiptService.php b/app/common/service/FinReceiptService.php
index 6dd69a7..5b04368 100644
--- a/app/common/service/FinReceiptService.php
+++ b/app/common/service/FinReceiptService.php
@@ -233,6 +233,12 @@ class FinReceiptService
             $query->where('submit_files','!=','');
         }
 
+        if($param['scene'] == 'delete'){ //查询作废数据
+            $query->onlyTrashed();
+        }elseif ($param['scene'] == 'all'){ //查询包含作废数据的全量数据
+            $query->withTrashed();
+        }
+
         if (isset($param['scene']) && ($param['scene'] == 'list' ||$param['scene'] == 'pending')) {
             return $query->paginate($limit, ['*'], 'page', $page);
         }
@@ -293,6 +299,13 @@ class FinReceiptService
         return $res;
     }
 
+
+    public function delete($id)
+    {
+        $res = FinReceipt::where('id', $id)->delete();
+        return $res;
+    }
+
     /**
      * 更新：绑定收款记录，计算折让金额
      * @param Request $request
diff --git a/config/route.php b/config/route.php
index ec7d821..e313549 100644
--- a/config/route.php
+++ b/config/route.php
@@ -359,8 +359,8 @@ Route::group('/admin', function () {
         Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
         Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
         Route::any('/payment', [app\common\controller\FinReceiptController::class, 'payment']);
-        Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
         Route::any('/credit', [app\common\controller\FinReceiptController::class, 'credit']);
+        Route::any('/delete', [app\common\controller\FinReceiptController::class, 'delete']);
     });
     // 收款记录历史
     Route::group('/receipt/his', function () {