diff --git a/Jenkinsfile b/Jenkinsfile index f3ec9511c..e0f8a152a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,6 +56,8 @@ def commonPathServices = [ ] def databaseMigrationPaths = ['deploy/sql/'] +// 暂停数据库结构只读门禁;保留实现,完成 Credentials 配置后改为 true。 +def databaseSchemaContractEnabled = false def downstreamResults = [:] def downstreamBuildUrls = [:] @@ -370,6 +372,9 @@ pipeline { } stage('数据库结构只读门禁') { + when { + expression { databaseSchemaContractEnabled } + } agent { label 'java-builder' } steps { script { diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 4b703a3c0..f33ade8d6 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -163,6 +163,7 @@ services: FILE_DB_USERNAME: ${FILE_DB_USERNAME} FILE_DB_PASSWORD: ${FILE_DB_PASSWORD} FILE_STORAGE_ROOT: /data/files + PDA_UPDATE_PUBLIC_BASE_URL: ${PDA_UPDATE_PUBLIC_BASE_URL:-} JAVA_TOOL_OPTIONS: "-Xms1g -Xmx2g -XX:+ExitOnOutOfMemoryError -Dfile.encoding=UTF-8" # Compose 会插值整份文件,即使只部署 auth 等其他服务;File 的必填校验由 deploy-services.sh 按服务执行。 ROCKETMQ_NAME_SERVER: ${ROCKETMQ_NAME_SERVER-} diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java index bad194527..e70c5bbdf 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java @@ -4,6 +4,8 @@ import com.baiyue.common.core.api.ApiResponse; import com.baiyue.common.core.api.PageResult; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; @@ -29,6 +31,13 @@ public interface PendingReviewOrderClient { @RequestParam long page, @RequestParam long size); + @PostMapping("/batch") + ApiResponse> batch( + @RequestHeader("X-Internal-Service-Token") String token, + @RequestBody BatchRequest request); + + record BatchRequest(List orderIds) {} + record Row(Long orderId, String orderNo, String inboundCode, Long customerId, String customerName, Long warehouseId, String channelCode, String channelName, int totalPackageCount, LocalDateTime createdAt, LocalDateTime expectedArrivalAt, diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java index eef7d4cfb..2be528ce5 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java @@ -13,6 +13,11 @@ import static com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRo /** 同柜不可拆组在 Firstleg 单库内的唯一持久化入口。 */ @Mapper public interface ColoadGroupMapper { + @Select({""}) + List existingOrderIds(@Param("orderIds") List orderIds); + @Select({"