diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
index b122c1a..db780bb 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
@@ -2,9 +2,9 @@ package com.bonus.zlpt.equip.mapper;
 
 import java.util.List;
 
-import com.bonus.zlpt.equip.api.domain.DevInfo;
-import com.bonus.zlpt.equip.api.domain.dto.InforMationDto;
-import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
+import com.bonus.zlpt.common.core.domain.equip.DevInfo;
+import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto;
+import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
 import com.bonus.zlpt.common.core.domain.system.SysFile;
 
 /**
@@ -75,7 +75,10 @@ public interface DevInfoMapper
      */
     public int deleteDevInfoByMaIds(Long[] maIds);
 
-
+    /**
+     * 添加经纬度信息
+     * @param inforMationDto
+     * @return
+     */
     int insertLon(InforMationDto inforMationDto);
-
 }
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
index 5fc3dc9..984fa64 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
@@ -74,14 +74,18 @@ public class OrderDetailsController extends BaseController
     {
         OrderDetailsVo orderDetails = orderDetailsService.selectOrderDetailsById(id);
         Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId());
-        Map map2 = (Map) map1.get(DATA_TAG);
-        String typeName = (String) map2.get("typeName");
-        String groupName = (String) map2.get("groupName");
-        String modelName = (String) map2.get("modelName");
-        String deviceName = (String) map2.get("deviceName");
-        orderDetails.setTypeName(typeName);
-        orderDetails.setGroupName(groupName);
-        orderDetails.setDeviceName(modelName+deviceName);
+        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");
+                orderDetails.setTypeName(typeName);
+                orderDetails.setGroupName(groupName);
+                orderDetails.setDeviceName(modelName + deviceName);
+            }
+        }
         return success(orderDetails);
     }