diff --git a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/PortScheduleMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/PortScheduleMapper.java index 5514b50cf..ba59385d7 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/PortScheduleMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/PortScheduleMapper.java @@ -52,7 +52,7 @@ public interface PortScheduleMapper extends BaseMapper { observed_at=#{value.observedAt},expires_at=#{value.expiresAt},remark=#{value.remark}, updated_by=#{operatorId},updated_by_name=#{operatorName},updated_at=CURRENT_TIMESTAMP(3),version=version+1 WHERE id=#{value.id} AND customer_id=#{value.customerId} AND ocean_booking_id=#{value.oceanBookingId} - AND (container_booking_id<=>#{value.containerBookingId}) AND version=#{expectedVersion} + AND (container_booking_id <=> #{value.containerBookingId}) AND version=#{expectedVersion} """) int updateSchedule(@Param("value") PortScheduleEntity value, @Param("expectedVersion") int expectedVersion, diff --git a/firstleg/src/test/java/com/baiyue/firstleg/portschedule/repository/PortScheduleMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/portschedule/repository/PortScheduleMapperContractTest.java index ef4cb4025..747b5582a 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/portschedule/repository/PortScheduleMapperContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/portschedule/repository/PortScheduleMapperContractTest.java @@ -32,8 +32,9 @@ class PortScheduleMapperContractTest { .contains("version=version+1") .contains("customer_id=#{value.customerId}") .contains("ocean_booking_id=#{value.oceanBookingId}") - .contains("container_booking_id<=>#{value.containerBookingId}") - .contains("version=#{expectedVersion}"); + .contains("container_booking_id <=> #{value.containerBookingId}") + .contains("version=#{expectedVersion}") + .doesNotContain("<=>"); } @Test diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index d099e2614..af97a5f14 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -77,7 +77,7 @@ spring: - id: firstleg-service uri: lb://firstleg-service predicates: - - Path=/api/merchant/v1/first-leg/**,/api/merchant/v1/customs/**,/api/platform/v1/first-leg/**,/api/platform/v1/customs/**,/api/platform/v1/port-schedules/**,/api/platform/v1/containers/**,/api/platform/v1/ocean-bookings/**,/api/platform/v1/truck-appointments/**,/api/platform/v1/fba-pricing/**,/api/platform/v1/inbounds/**,/api/platform/v1/fee-items/**,/api/platform/inbounds/**,/openapi/v1/inbound-measurements/** + - Path=/api/merchant/v1/first-leg/**,/api/merchant/v1/customs/**,/api/platform/v1/first-leg/**,/api/platform/v1/customs/**,/api/platform/v1/port-schedules/**,/api/platform/v1/carrier-schedule-queries/**,/api/platform/v1/containers/**,/api/platform/v1/ocean-bookings/**,/api/platform/v1/truck-appointments/**,/api/platform/v1/fba-pricing/**,/api/platform/v1/inbounds/**,/api/platform/v1/fee-items/**,/api/platform/inbounds/**,/openapi/v1/inbound-measurements/** # Swagger 文档聚合路由。 - id: auth-openapi uri: lb://auth-service diff --git a/gateway/src/test/java/com/baiyue/gateway/config/FirstlegContainerRouteContractTest.java b/gateway/src/test/java/com/baiyue/gateway/config/FirstlegContainerRouteContractTest.java index 923751a55..5baacf2da 100644 --- a/gateway/src/test/java/com/baiyue/gateway/config/FirstlegContainerRouteContractTest.java +++ b/gateway/src/test/java/com/baiyue/gateway/config/FirstlegContainerRouteContractTest.java @@ -35,6 +35,7 @@ class FirstlegContainerRouteContractTest { .contains("/api/platform/v1/customs/**") .contains("/api/merchant/v1/customs/**") .contains("/api/platform/v1/port-schedules/**") + .contains("/api/platform/v1/carrier-schedule-queries/**") .contains("/api/platform/v1/first-leg/**"); } }