优化

warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java

@@ -5,6 +5,7 @@ import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.warehouse.dto.WarehouseDetailResponse;
 import com.baiyue.warehouse.dto.OverseasPartnerWarehouseResponse;
+import com.baiyue.warehouse.dto.SharedOverseasWarehouseResponse;
 import com.baiyue.warehouse.service.WarehouseApplicationService;
 import jakarta.annotation.Resource;
 import jakarta.annotation.PostConstruct;
@@ -48,6 +49,21 @@ public class InternalWarehouseController {
         return ApiResponse.success(service.activeOverseasPartners());
     }
 
+    @GetMapping("/shared-overseas")
+    public ApiResponse<List<SharedOverseasWarehouseResponse>> sharedOverseasWarehouses(
+            @RequestHeader(value="X-Internal-Service-Token", required=false) String token) {
+        verifyToken(token);
+        return ApiResponse.success(service.activeSharedOverseasWarehouses());
+    }
+
+    @GetMapping("/shared-overseas/{warehouseId}")
+    public ApiResponse<SharedOverseasWarehouseResponse> sharedOverseasWarehouse(
+            @RequestHeader(value="X-Internal-Service-Token", required=false) String token,
+            @PathVariable long warehouseId) {
+        verifyToken(token);
+        return ApiResponse.success(service.activeSharedOverseasWarehouse(warehouseId));
+    }
+
     private void verifyToken(String token) {
         byte[] supplied = token == null ? new byte[0] : token.getBytes(StandardCharsets.UTF_8);
         if (!MessageDigest.isEqual(expected, supplied)) {

warehouse/src/main/java/com/baiyue/warehouse/dto/SharedOverseasWarehouseResponse.java

@@ -0,0 +1,19 @@
+package com.baiyue.warehouse.dto;
+
+import com.baiyue.warehouse.entity.WarehouseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "SharedOverseasWarehouseResponse",
+    description = "Domestic-authoritative active shared overseas receiving warehouse")
+public record SharedOverseasWarehouseResponse(
+    Long warehouseId,
+    String warehouseCode,
+    String warehouseName,
+    String countryCode,
+    String status
+) {
+    public static SharedOverseasWarehouseResponse of(WarehouseEntity warehouse) {
+        return new SharedOverseasWarehouseResponse(warehouse.getId(), warehouse.getWarehouseCode(),
+            warehouse.getWarehouseName(), warehouse.getCountryCode(), warehouse.getStatus());
+    }
+}

warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java

@@ -9,6 +9,7 @@ import com.baiyue.warehouse.dto.WarehouseDetailResponse;
 import com.baiyue.warehouse.dto.WarehouseRequests;
 import com.baiyue.warehouse.dto.OverseasPartnerWarehouseResponse;
 import com.baiyue.warehouse.dto.WarehouseSummaryResponse;
+import com.baiyue.warehouse.dto.SharedOverseasWarehouseResponse;
 import com.baiyue.warehouse.entity.ServiceCapabilityEntity;
 import com.baiyue.warehouse.entity.WarehouseAddressEntity;
 import com.baiyue.warehouse.entity.WarehouseEntity;
@@ -95,6 +96,32 @@ public class WarehouseApplicationService {
             .toList();
     }
 
+    public List<SharedOverseasWarehouseResponse> activeSharedOverseasWarehouses() {
+        return repository.findActiveByType(WarehouseSaveNormalizer.PUBLIC_TENANT_ID,
+                WarehouseSaveNormalizer.TYPE_OVERSEAS)
+            .stream()
+            .filter(warehouse -> hasReceivingCapability(warehouse.getId()))
+            .map(SharedOverseasWarehouseResponse::of)
+            .toList();
+    }
+
+    public SharedOverseasWarehouseResponse activeSharedOverseasWarehouse(long warehouseId) {
+        WarehouseEntity warehouse = repository.findOwned(WarehouseSaveNormalizer.PUBLIC_TENANT_ID, warehouseId);
+        if (warehouse == null || !"ACTIVE".equals(warehouse.getStatus())
+            || !WarehouseSaveNormalizer.TYPE_OVERSEAS.equals(warehouse.getWarehouseType())
+            || !hasReceivingCapability(warehouseId)) {
+            throw new BizException(ResultCode.NOT_FOUND,
+                "启用的公共海外收货仓不存在");
+        }
+        return SharedOverseasWarehouseResponse.of(warehouse);
+    }
+
+    private boolean hasReceivingCapability(long warehouseId) {
+        return repository.findCapabilities(WarehouseSaveNormalizer.PUBLIC_TENANT_ID, warehouseId).stream()
+            .anyMatch(capability -> "RECEIVING".equals(capability.getCapabilityCode())
+                && Boolean.TRUE.equals(capability.getEnabled()));
+    }
+
     public WarehouseDetailResponse activeDetail(long tenantId, long id) {
         WarehouseEntity warehouse = repository.findOwned(tenantId, id);
         if (warehouse == null) {

warehouse/src/main/resources/db/warehouse-public-master-data.sql

@@ -162,7 +162,7 @@ JOIN wh_warehouse warehouse
 ON DUPLICATE KEY UPDATE
   tenant_id = VALUES(tenant_id);
 
--- 国内固定作业仓必须启用收货能力，FBA 目的地址仍不得创建作业能力。
+-- 四个固定平台作业仓必须启用收货能力，FBA 目的地址仍不得创建作业能力。
 INSERT INTO wh_service_capability (
   id, tenant_id, warehouse_id, capability_code, capability_name, enabled, cutoff_time,
   description, created_by, created_at, updated_by, updated_at, deleted, version
@@ -171,7 +171,11 @@ VALUES
   (193000000000400001,0,193000000000200001,'RECEIVING','头程收货',1,'16:00:00',
    '义乌仓头程订单收货能力',NULL,CURRENT_TIMESTAMP(3),NULL,CURRENT_TIMESTAMP(3),0,0),
   (193000000000400002,0,193000000000200002,'RECEIVING','头程收货',1,'16:00:00',
-   '东莞仓头程订单收货能力',NULL,CURRENT_TIMESTAMP(3),NULL,CURRENT_TIMESTAMP(3),0,0)
+   '东莞仓头程订单收货能力',NULL,CURRENT_TIMESTAMP(3),NULL,CURRENT_TIMESTAMP(3),0,0),
+  (193000000000400003,0,193000000000200003,'RECEIVING','海外收货',1,'16:00:00',
+   '洛杉矶仓海外接柜入仓收货能力',NULL,CURRENT_TIMESTAMP(3),NULL,CURRENT_TIMESTAMP(3),0,0),
+  (193000000000400004,0,193000000000200004,'RECEIVING','海外收货',1,'16:00:00',
+   '纽约仓海外接柜入仓收货能力',NULL,CURRENT_TIMESTAMP(3),NULL,CURRENT_TIMESTAMP(3),0,0)
 ON DUPLICATE KEY UPDATE
   capability_name = VALUES(capability_name),
   enabled = VALUES(enabled),
@@ -677,11 +681,11 @@ BEGIN
   IF (SELECT COUNT(*)
         FROM wh_service_capability capability
        WHERE capability.tenant_id = 0
-         AND capability.warehouse_id IN (193000000000200001,193000000000200002)
+         AND capability.warehouse_id IN (193000000000200001,193000000000200002,193000000000200003,193000000000200004)
          AND capability.capability_code = 'RECEIVING'
          AND capability.enabled = 1
-         AND capability.deleted = 0) <> 2 THEN
-    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '国内固定作业仓收货能力写入校验失败';
+         AND capability.deleted = 0) <> 4 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '固定平台作业仓收货能力写入校验失败';
   END IF;
 END//
 DELIMITER ;