diff --git a/app/controller/task/InvoiceIssuanceTask.php b/app/controller/task/InvoiceIssuanceTask.php index 83773bf..f37c1d1 100644 --- a/app/controller/task/InvoiceIssuanceTask.php +++ b/app/controller/task/InvoiceIssuanceTask.php @@ -26,19 +26,7 @@ class InvoiceIssuanceTask extends Base foreach ($InvoiceIssuanceData as $InvoiceIssuanceValue) { $result = (new InvoiceIssuanceService())->IssueAnInvoice($InvoiceIssuanceValue); if ($result === true) { - - if ($InvoiceIssuanceValue['email']) { - - // 发送发票到邮箱 - $path = InvoiceIssuanceService::getQrCode($InvoiceIssuanceValue['id']); - $emailResult = (new EmailService())->sendInvoice($InvoiceIssuanceValue['email'], '发票', $path); - if ($emailResult === true && $InvoiceIssuanceValue['mobile']) { - // 发送短信 - $SmsService = new SmsService(); - $SmsService->sendSms($InvoiceIssuanceValue['mobile'], $SmsService->smsInvoiceTemplate($InvoiceIssuanceValue['email'])); - } - } - + $this->invoiceSuccess($InvoiceIssuanceValue); } } return $this->buildSuccess(); @@ -58,9 +46,27 @@ class InvoiceIssuanceTask extends Base $where = ['status' => 1, 'delete_time' => 0]; $InvoiceIssuanceData = (new InvoiceIssuanceModel())->where($where)->page(1, $limit)->select(); foreach ($InvoiceIssuanceData as $InvoiceIssuanceValue) { - (new InvoiceIssuanceService())->cancelInitiateAgain($InvoiceIssuanceValue); + $result = (new InvoiceIssuanceService())->cancelInitiateAgain($InvoiceIssuanceValue); + if ($result === true) { + $this->invoiceSuccess($InvoiceIssuanceValue); + } } return $this->buildSuccess(); } + private function invoiceSuccess($InvoiceIssuanceValue) + { + if ($InvoiceIssuanceValue['email']) { + + // 发送发票到邮箱 + $path = InvoiceIssuanceService::getQrCode($InvoiceIssuanceValue['id']); + $emailResult = (new EmailService())->sendInvoice($InvoiceIssuanceValue['email'], '发票', $path); + if ($emailResult === true && $InvoiceIssuanceValue['mobile']) { + // 发送短信 + $SmsService = new SmsService(); + $SmsService->sendSms($InvoiceIssuanceValue['mobile'], $SmsService->smsInvoiceTemplate($InvoiceIssuanceValue['email'])); + } + } + } + }