java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(phase3): route carrier queries and repair schedule updates

Browse Source
This commit is contained in:
ouyangxq
2026-08-10 12:56:02 +08:00
parent ea1346ee2c
commit 64ba5ae249
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/portschedule/mapper/PortScheduleMapper.java
+1 -1
View File
@@ -52,7 +52,7 @@ public interface PortScheduleMapper extends BaseMapper<PortScheduleEntity> {
observed_at=#{value.observedAt},expires_at=#{value.expiresAt},remark=#{value.remark}, 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 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} WHERE id=#{value.id} AND customer_id=#{value.customerId} AND ocean_booking_id=#{value.oceanBookingId}
AND (container_booking_id&lt;=&gt;#{value.containerBookingId}) AND version=#{expectedVersion} AND (container_booking_id <=> #{value.containerBookingId}) AND version=#{expectedVersion}
""") """)
int updateSchedule(@Param("value") PortScheduleEntity value, int updateSchedule(@Param("value") PortScheduleEntity value,
@Param("expectedVersion") int expectedVersion, @Param("expectedVersion") int expectedVersion,
firstleg/src/test/java/com/baiyue/firstleg/portschedule/repository/PortScheduleMapperContractTest.java
+3 -2
View File
@@ -32,8 +32,9 @@ class PortScheduleMapperContractTest {
.contains("version=version+1") .contains("version=version+1")
.contains("customer_id=#{value.customerId}") .contains("customer_id=#{value.customerId}")
.contains("ocean_booking_id=#{value.oceanBookingId}") .contains("ocean_booking_id=#{value.oceanBookingId}")
.contains("container_booking_id&lt;=&gt;#{value.containerBookingId}") .contains("container_booking_id <=> #{value.containerBookingId}")
.contains("version=#{expectedVersion}"); .contains("version=#{expectedVersion}")
.doesNotContain("&lt;=&gt;");
} }
@Test @Test
gateway/src/main/resources/application.yml
+1 -1
View File
@@ -77,7 +77,7 @@ spring:
- id: firstleg-service - id: firstleg-service
uri: lb://firstleg-service uri: lb://firstleg-service
predicates: 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 文档聚合路由。 # Swagger 文档聚合路由。
- id: auth-openapi - id: auth-openapi
uri: lb://auth-service uri: lb://auth-service
gateway/src/test/java/com/baiyue/gateway/config/FirstlegContainerRouteContractTest.java
+1
View File
@@ -35,6 +35,7 @@ class FirstlegContainerRouteContractTest {
.contains("/api/platform/v1/customs/**") .contains("/api/platform/v1/customs/**")
.contains("/api/merchant/v1/customs/**") .contains("/api/merchant/v1/customs/**")
.contains("/api/platform/v1/port-schedules/**") .contains("/api/platform/v1/port-schedules/**")
.contains("/api/platform/v1/carrier-schedule-queries/**")
.contains("/api/platform/v1/first-leg/**"); .contains("/api/platform/v1/first-leg/**");
} }
} }