From 4c539cf5e06436df95267d5f32869d8f9e42a3b0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 27 Dec 2024 17:46:38 +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=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/InvoiceIssuance.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/InvoiceIssuance.php b/app/controller/admin/InvoiceIssuance.php
index 796db97..6c7b5c0 100644
--- a/app/controller/admin/InvoiceIssuance.php
+++ b/app/controller/admin/InvoiceIssuance.php
@@ -44,7 +44,7 @@ class InvoiceIssuance extends Base
         $InvoiceIssuanceModel = new InvoiceIssuanceModel();
         $InvoiceHead          = new InvoiceHead();
 
-        $field = 'id,project_id,merge,pucode,expire_time,mobile,email,create_time,status,amount,invoice_head_id,cancel_time,issuance_time';
+        $field = 'id,project_id,merge,pucode,expire_time,mobile,email,create_time,status,amount,invoice_head_id,cancel_time,issuance_time,cancel_time';
 
         $listObj  = $InvoiceIssuanceModel->where($where)
                                          ->order('create_time', 'DESC')
@@ -57,6 +57,7 @@ class InvoiceIssuance extends Base
                 $item->expire_time   = $item->expire_time ? date("Y-m", $item->expire_time) : '';
                 $item->cancel_time   = $item->cancel_time ? date("Y-m-d H:i:s", $item->cancel_time) : '';
                 $item->issuance_time = $item->issuance_time ? date("Y-m-d H:i:s", $item->issuance_time) : '';
+                $item->cancel_time   = $item->cancel_time ? date("Y-m-d H:i:s", $item->cancel_time) : '';
 
                 $InvoiceHeadRes   = $InvoiceHead->where('id', $item->invoice_head_id)->find();
                 $item->head_type  = '';
@@ -111,7 +112,7 @@ class InvoiceIssuance extends Base
                 $status = $InvoiceIssuance['status'] == 3 ? '已开票' : '已作废';
                 throw new \Exception($status . '，无法作废');
             }
-            $data   = ['status' => 4];
+            $data   = ['status' => 4, 'cancel_time' => time()];
             $result = $InvoiceIssuance->save($data);
             if (!$result) {
                 throw new \Exception('作废失败');