申请记录详情虚拟卡修复

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -594,8 +594,10 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
         BeanUtil.copyProperties(order, userApplyMachineDetailVO);
         //查询仓库
         KxsWarehouse warehouse = kxsWarehouseMapper.selectById(order.getWarehouseId());
-        userApplyMachineDetailVO.setWarehouseName(warehouse.getWarehouseName() + "--" + warehouse.getBrandName());
-        userApplyMachineDetailVO.setWarehousePhone(warehouse.getWarehousePhone());
+        if(warehouse != null){
+            userApplyMachineDetailVO.setWarehouseName(warehouse.getWarehouseName() + "--" + warehouse.getBrandName());
+            userApplyMachineDetailVO.setWarehousePhone(warehouse.getWarehousePhone());
+        }
 
         //订单状态
         String statusNo = EnumUtil.getFieldBy(MachineOrderStatusEnum::getDescription, MachineOrderStatusEnum::getType, order.getStatus());