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) {