fix(ID1004248): 博西PEA_V1.1-推荐工程师页-地图常规位置：取值“派单首选地点，数据源在工程师的「位置配置」”，部分工程师没有位置信息时，地图上可不标注。

project-order/src/main/java/com/dituhui/pea/order/service/EngineerBusinessService.java

@@ -19,7 +19,7 @@ public interface EngineerBusinessService {
     /**
     /**
      * 获取工程师出发位置
      * 获取工程师出发位置
      * @param engineerCode 工程师编号
      * @param engineerCode 工程师编号
-     * @return  工程师出发位置
+     * @return  工程师出发位置  注意： 此方法可能返回null值
      */
      */
     TLocation engineerDepartLocation(String engineerCode);
     TLocation engineerDepartLocation(String engineerCode);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerBusinessServiceImpl.java

@@ -134,11 +134,14 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
     @Override
     @Override
     public TLocation engineerDepartLocation(String engineerCode) {
     public TLocation engineerDepartLocation(String engineerCode) {
         EngineerBusinessEntity byEngineerCode = engineerBusinessDao.getByEngineerCode(engineerCode);
         EngineerBusinessEntity byEngineerCode = engineerBusinessDao.getByEngineerCode(engineerCode);
+        if (StringUtils.isNotBlank(byEngineerCode.getX()) || StringUtils.isNotBlank(byEngineerCode.getY())) {
             TLocation location = new TLocation();
             TLocation location = new TLocation();
             location.setAddress(byEngineerCode.getAddress());
             location.setAddress(byEngineerCode.getAddress());
-        location.setLongitude(StringUtils.isNotBlank(byEngineerCode.getX()) ? Double.parseDouble(byEngineerCode.getX()) : 0.0);
-        location.setLatitude(StringUtils.isNotBlank(byEngineerCode.getY()) ? Double.parseDouble(byEngineerCode.getY()) : 0.0);
+            location.setLongitude(Double.parseDouble(byEngineerCode.getX()));
+            location.setLatitude(Double.parseDouble(byEngineerCode.getY()));
             location.setLocationType(LocationType.GENERAL);
             location.setLocationType(LocationType.GENERAL);
             return location;
             return location;
         }
         }
+        return null;
+    }
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java

@@ -433,15 +433,16 @@ public class OrderAssignImpl implements OrderAssign {
 
 
         ArrayList<TLocation> resultLocationList = new ArrayList<>();
         ArrayList<TLocation> resultLocationList = new ArrayList<>();
         TLocation generalLocation = engineerBusinessService.engineerDepartLocation(engineerCode);
         TLocation generalLocation = engineerBusinessService.engineerDepartLocation(engineerCode);
-        //常规位置， 出发地
-        resultLocationList.add(generalLocation);
         if (finishedOrder.isPresent()) {
         if (finishedOrder.isPresent()) {
             OrderInfoEntity finishedOrderInfo = finishedOrder.get();
             OrderInfoEntity finishedOrderInfo = finishedOrder.get();
             quasiRealTimeLocation.setAddress(finishedOrderInfo.getAddress());
             quasiRealTimeLocation.setAddress(finishedOrderInfo.getAddress());
             quasiRealTimeLocation.setLongitude(Double.parseDouble(finishedOrderInfo.getX()));
             quasiRealTimeLocation.setLongitude(Double.parseDouble(finishedOrderInfo.getX()));
             quasiRealTimeLocation.setLatitude(Double.parseDouble(finishedOrderInfo.getY()));
             quasiRealTimeLocation.setLatitude(Double.parseDouble(finishedOrderInfo.getY()));
             currentOrder = finishedOrderInfo;
             currentOrder = finishedOrderInfo;
-        } else {
+        } else if (Objects.nonNull(generalLocation)){
+            //常规位置， 出发地
+            resultLocationList.add(generalLocation);
+            //准实时位置
             quasiRealTimeLocation.setAddress(generalLocation.getAddress());
             quasiRealTimeLocation.setAddress(generalLocation.getAddress());
             quasiRealTimeLocation.setLongitude(generalLocation.getLongitude());
             quasiRealTimeLocation.setLongitude(generalLocation.getLongitude());
             quasiRealTimeLocation.setLatitude(generalLocation.getLatitude());
             quasiRealTimeLocation.setLatitude(generalLocation.getLatitude());