From 0ea8d276947888acafbcdc60f0db2d53e7d915a0 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Fri, 8 Dec 2023 20:11:50 +0800
Subject: [PATCH] fix

---
 .../order/controller/OrderInfoController.java | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
index 36acd1b..2ac4552 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
@@ -2,6 +2,7 @@ package com.bonus.zlpt.order.controller;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
 import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
@@ -98,28 +99,30 @@ public class OrderInfoController extends BaseController
     public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
     {
         OrderInfoVo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderId);
-        Map map1 = (Map) remoteDevInfoService.getInfo(orderInfo.getMaId());
-        if (map1 != null) {
-            Map map2 = (Map) map1.get(DATA_TAG);
-            if (map2 != null) {
-                String typeName = (String) map2.get("typeName");
-                String groupName = (String) map2.get("groupName");
-                String modelName = (String) map2.get("modelName");
-                String deviceName = (String) map2.get("deviceName");
-                orderInfo.setTypeName(typeName);
-                orderInfo.setGroupName(groupName);
-                orderInfo.setDeviceName(modelName + deviceName);
-                //装备编号，图片，品牌，规格，位置addressId，月租金
-                orderInfo.setDeviceCode((String) map2.get("code"));
-                orderInfo.setDevicePicUrl((String) map2.get("picUrl"));
-                orderInfo.setDeviceBrand((String) map2.get("brand"));
-                orderInfo.setDeviceSpecification((String) map2.get("specification"));
-                orderInfo.setDeviceLocation((String) map2.get("location"));
-                try {
-                    Double price = (Double) map2.get("monthLeasePrice");
-                    orderInfo.setDeviceMonthLeasePrice(price);
-                } catch (Exception e) {
-                    e.printStackTrace();
+        if (Objects.nonNull(orderInfo)) {
+            Map map1 = (Map) remoteDevInfoService.getInfo(orderInfo.getMaId());
+            if (map1 != null) {
+                Map map2 = (Map) map1.get(DATA_TAG);
+                if (map2 != null) {
+                    String typeName = (String) map2.get("typeName");
+                    String groupName = (String) map2.get("groupName");
+                    String modelName = (String) map2.get("modelName");
+                    String deviceName = (String) map2.get("deviceName");
+                    orderInfo.setTypeName(typeName);
+                    orderInfo.setGroupName(groupName);
+                    orderInfo.setDeviceName(modelName + deviceName);
+                    //装备编号，图片，品牌，规格，位置addressId，月租金
+                    orderInfo.setDeviceCode((String) map2.get("code"));
+                    orderInfo.setDevicePicUrl((String) map2.get("picUrl"));
+                    orderInfo.setDeviceBrand((String) map2.get("brand"));
+                    orderInfo.setDeviceSpecification((String) map2.get("specification"));
+                    orderInfo.setDeviceLocation((String) map2.get("location"));
+                    try {
+                        Double price = (Double) map2.get("monthLeasePrice");
+                        orderInfo.setDeviceMonthLeasePrice(price);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }