From f3b9eb36d6dc0d7cf551a298698e004ae44e79b1 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 24 May 2023 16:18:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E8=B4=AD=E8=BD=A6=E4=BA=BA=E3=80=81=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 6fc3dd5b61..8159d67f2b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -870,6 +870,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
             //主车
             BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
+            //查询实际购车人
+            BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+            baseVehicleZSOutDto.setRealityBuyCarName(busDeliveredUseMessage.getName());
+            baseVehicleZSOutDto.setRealityBuyCarPhone(busDeliveredUseMessage.getMobile());
             baseVehicleZSOutDto.setVinSid(busDeliveredApplyDetails.getVinSid());
             baseVehicleZSOutDto.setVinNo(busDeliveredApplyDetails.getVinNo());
             baseVehicleZSOutDto.setPrice(busDeliveredApply.getPrice());

From d10cb7374164bdf4e0c8387ce33894ac24686834 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 24 May 2023 16:19:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E8=B4=AD=E8=BD=A6=E4=BA=BA=E3=80=81=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 8159d67f2b..6c131bd5ef 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -872,8 +872,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
             //查询实际购车人
             BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
-            baseVehicleZSOutDto.setRealityBuyCarName(busDeliveredUseMessage.getName());
-            baseVehicleZSOutDto.setRealityBuyCarPhone(busDeliveredUseMessage.getMobile());
+            if(busDeliveredUseMessage != null){
+                baseVehicleZSOutDto.setRealityBuyCarName(busDeliveredUseMessage.getName());
+                baseVehicleZSOutDto.setRealityBuyCarPhone(busDeliveredUseMessage.getMobile());
+            }
             baseVehicleZSOutDto.setVinSid(busDeliveredApplyDetails.getVinSid());
             baseVehicleZSOutDto.setVinNo(busDeliveredApplyDetails.getVinNo());
             baseVehicleZSOutDto.setPrice(busDeliveredApply.getPrice());