From 53008e733dcaf2c7307d8d2b7fcfa2eb32e91f0a Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Thu, 16 Jan 2025 17:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=82=AE=E7=AE=B1=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E8=BF=94=E5=9B=9E2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/InvoiceIssuance.php | 27 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/controller/api/InvoiceIssuance.php b/app/controller/api/InvoiceIssuance.php
index 562c5ea..89538d8 100644
--- a/app/controller/api/InvoiceIssuance.php
+++ b/app/controller/api/InvoiceIssuance.php
@@ -141,26 +141,31 @@ class InvoiceIssuance extends Base
             $userRes = (new WechatUser())->where('id', $wechat_user_id)->find();
             $data['email'] = $userRes['email'];
 
-            if (!isset($data['tax_number'])) {
+            $feeUserInfo = [];
+            if (!isset($data['tax_number']) || empty($userRes['email'])) {
                 $pucode = (new WechatPucode())->where('wechat_user_id', $wechat_user_id)->value('pucode');
 
                 $feeUserInfo = (new InvoiceIssuanceService())->getFeeUserData($pucode);
+            }
+
+            if (empty($data['email'])) {
+                $data['email'] = $feeUserInfo['EMail'] ?? '';
+                if (!empty($data['email'])) {
+                    $userRes->email = $data['email'];
+                    $userRes->save();
+                }
+            }
 
-                $data = [
-                    'title' => $feeUserInfo['UserName'] ?? '',
-                ];
+            if (!isset($data['tax_number'])) {
+
+                $data['title'] = $feeUserInfo['UserName'] ?? '';
                 $data['type'] = 0;
                 if ($feeUserInfo['UserCategoryID'] == '普通居民') {
                     $data['type'] = 1;
                 }
                 $data['tax_number'] = !empty($feeUserInfo['CertificateCode']) ? $feeUserInfo['CertificateCode'] : '';
-                if (empty($data['email'])) {
-                    $data['email'] = $feeUserInfo['EMail'] ?? '';
-                    if (!empty($data['email'])) {
-                        $userRes->email = $data['email'];
-                        $userRes->save();
-                    }
-                }
+            } else {
+                $data = $data->toArray();
             }
             return $this->buildSuccess($data);
         } catch (\Exception $e) {