From fab9e82b51e97f79d958085dc97c50a4753ef47c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 10 Jun 2025 14:48:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=89=93=E5=8D=B0=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=A4=96=E9=83=A8=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/HardInvoiceServiceImpl.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
index 84ed8cef5..4b3a2c2a3 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
@@ -129,8 +129,15 @@ public class HardInvoiceServiceImpl extends ServiceImpl<HardInvoiceMapper, HardI
                 .eq(HardCarEntity::getParentCarId, order.getParentCarId())
         );
         // 查询用户
-        UserInfo user = Optional.of(userService.getInnerByUserId(order.getUserId())).map(R::getData).orElseThrow(() -> new RuntimeException("用户不存在"));
-        SysUser sysUser = user.getSysUser();
+        String username = "外部用户-未知用户";
+        String userPhone = "外部用户-未知手机号";
+        UserInfo user = userService.getInnerByUserId(order.getUserId()).getData();
+        if (ObjectUtil.isNotEmpty(user)) {
+            if (ObjectUtil.isNotEmpty(user.getSysUser())) {
+                username = user.getSysUser().getName();
+                userPhone = user.getSysUser().getPhone();
+            }
+        }
         // 查询商户
         MchManageVo mch = Optional.of(remoteMchService.getById(order.getMerchantId())).map(R::getData).orElseThrow(() -> new RuntimeException("商户不存在"));
         // 订单类型
@@ -154,8 +161,8 @@ public class HardInvoiceServiceImpl extends ServiceImpl<HardInvoiceMapper, HardI
         drawing.setDefaultStyle()
                 .drawingRowText("订单号", order.getId().toString())
                 .drawingRowText("订单类型", orderType)
-                .drawingRowText("用户", sysUser.getName())
-                .drawingRowText("手机号", sysUser.getPhone())
+                .drawingRowText("用户", username)
+                .drawingRowText("手机号", userPhone)
                 .drawingRowText("商户", mch.getName())
                 .drawingRowText("部门", mch.getDeptName())
                 .drawingRowText("下单时间", createTime)