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('作废失败');