From fc93988aa6f6e255e1a5c7dfbe83944ee6eaaed2 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 27 Dec 2024 17:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/InvoiceIssuance.php | 5 +++--
 app/model/InvoiceIssuance.php            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controller/admin/InvoiceIssuance.php b/app/controller/admin/InvoiceIssuance.php
index a570ba8..796db97 100644
--- a/app/controller/admin/InvoiceIssuance.php
+++ b/app/controller/admin/InvoiceIssuance.php
@@ -107,8 +107,9 @@ class InvoiceIssuance extends Base
                 throw new \Exception('缺少必要参数');
             }
             $InvoiceIssuance = (new InvoiceIssuanceModel())->where('id', $id)->find();
-            if ($InvoiceIssuance['status'] == 3) {
-                throw new \Exception('已开票，无法作废');
+            if (in_array($InvoiceIssuance['status'], [3, 4])) {
+                $status = $InvoiceIssuance['status'] == 3 ? '已开票' : '已作废';
+                throw new \Exception($status . '，无法作废');
             }
             $data   = ['status' => 4];
             $result = $InvoiceIssuance->save($data);
diff --git a/app/model/InvoiceIssuance.php b/app/model/InvoiceIssuance.php
index 00c3cac..e1e1449 100644
--- a/app/model/InvoiceIssuance.php
+++ b/app/model/InvoiceIssuance.php
@@ -9,6 +9,6 @@ class InvoiceIssuance extends Model
 
     public static $projectArr = ['', '垃圾费', '污水费', '游泳'];
 
-    public static $statusArr = ['未开票', '开票中', '开票失败', '已开票', '作废'];
+    public static $statusArr = ['未开票', '开票中', '开票失败', '已开票', '已作废'];
 
 }