新增邮箱地址返回2

app/controller/api/InvoiceIssuance.php

@@ -141,19 +141,13 @@ 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);
-
-                $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'])) {
@@ -161,6 +155,17 @@ class InvoiceIssuance extends Base
                     $userRes->save();
                 }
             }
+
+            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'] : '';
+            } else {
+                $data = $data->toArray();
             }
             return $this->buildSuccess($data);
         } catch (\Exception $e) {