From 44d945986eb0db173bfc16cc62028b7392b36879 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Thu, 26 Dec 2024 11:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=88=90=E5=8A=9F=20=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/task/InvoiceIssuanceTask.php | 34 ++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

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']));
+            }
+        }
+    }
+
 }