fix:修复高德打车地点无法映射行程的问题

src/main/java/com/chint/domain/repository/LocationRepository.java

@@ -59,5 +59,5 @@ public interface LocationRepository {
 
     List<Location> findNotChintCityByLevel(String locationNames, Integer level);
 
-    List<Location> findByLocationNameContainingAndIfInternal(String locationName,Integer ifInternal);
+    List<Location> findByLocationNameContainingAndIfInternalAndLocationType(String locationName, Integer ifInternal, Integer locationType);
 }

src/main/java/com/chint/domain/service/supplier/AmapOrderDataAdapter.java

@@ -61,11 +61,11 @@ public class AmapOrderDataAdapter implements OrderDataAdapter {
         }
 
         Optional<Long> startLocationId = locationRepository
-                .findByLocationNameContainingAndIfInternal(handlerLocationName(data.getStartCity()), 1).stream().findFirst()
+                .findByLocationNameContainingAndIfInternalAndLocationType(handlerLocationName(data.getStartCity()), 1, 4).stream().findFirst()
                 .flatMap(it -> Optional.ofNullable(it.getLocationId()));
 
         Optional<Long> endCityLocationId = locationRepository
-                .findByLocationNameContainingAndIfInternal(handlerLocationName(data.getEndCity()), 1).stream().findFirst()
+                .findByLocationNameContainingAndIfInternalAndLocationType(handlerLocationName(data.getEndCity()), 1, 4).stream().findFirst()
                 .flatMap(it -> Optional.ofNullable(it.getLocationId()));
 
         return Optional.of(
@@ -86,7 +86,7 @@ public class AmapOrderDataAdapter implements OrderDataAdapter {
                         .destinationName(data.getEndName())
                         .supplierName(SUPPLIER_AMAP)
                         .originId(startLocationId.orElse(null))
-                        .originId(endCityLocationId.orElse(null))
+                        .destinationId(endCityLocationId.orElse(null))
                         .build());
     }
 
@@ -122,7 +122,7 @@ public class AmapOrderDataAdapter implements OrderDataAdapter {
         }
         //如果最后一位是市，去掉最后一位
         if (locationName.endsWith("市")) {
-            return locationName.substring(0, locationName.length() - 2);
+            return locationName.substring(0, locationName.length() - 1);
         }
         return locationName;
     }

src/main/java/com/chint/infrastructure/repository/LocationRepositoryImpl.java

@@ -215,8 +215,8 @@ public class LocationRepositoryImpl implements LocationRepository {
     }
 
     @Override
-    public List<Location> findByLocationNameContainingAndIfInternal(String locationName, Integer ifInternal) {
+    public List<Location> findByLocationNameContainingAndIfInternalAndLocationType(String locationName, Integer ifInternal, Integer locationType) {
-        return jdbcLocationRepository.findByLocationNameContainingAndIsInternal(locationName, ifInternal);
+        return jdbcLocationRepository.findByLocationNameContainingAndIsInternalAndLocationType(locationName, ifInternal,  locationType);
     }
 
 

src/main/java/com/chint/infrastructure/repository/jdbc/JdbcLocationRepository.java

@@ -70,5 +70,5 @@ public interface JdbcLocationRepository extends CrudRepository<Location, Long> {
 
     List<Location> findByLevelAndIsInternal(Integer level, Integer isInternal);
 
-    List<Location> findByLocationNameContainingAndIsInternal(String locationName, Integer isInternal);
+    List<Location> findByLocationNameContainingAndIsInternalAndLocationType(String locationName, Integer isInternal, Integer locationType);
 }

src/test/java/com/chint/RouteApplicationTests.java

@@ -1127,9 +1127,7 @@ class RouteApplicationTests {
 
     @Test
     void deleteByOrderId() {
-
+        orderDetailRepository.deleteById(3138L);
-        orderDetailRepository.deleteById(3105L);
-        orderDetailRepository.deleteById(3106L);
     }
 
     //    @Test