Merge branch 'test' into test-02huogui

# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/BaiyueFirstlegApplication.java
#	firstleg/src/main/resources/openapi/firstleg-v1.yaml

firstleg/src/main/java/com/baiyue/firstleg/controller/InternalInboundOrderController.java

@@ -53,7 +53,9 @@ public class InternalInboundOrderController {
             throw new BizException(ResultCode.FORBIDDEN, "内部服务凭证无效");
         }
         if (command.tenantId() <= 0 || command.orderId() <= 0 || command.warehouseId() == null
-            || command.warehouseId() <= 0 || command.customerName() == null || command.customerName().isBlank()) {
+            || command.warehouseId() <= 0 || command.customerName() == null || command.customerName().isBlank()
+            || command.inboundCode() == null || command.inboundCode().isBlank()
+            || command.inboundCode().length() > 40) {
             throw new BizException(ResultCode.BAD_REQUEST, "订单入库快照不完整");
         }
         return ApiResponse.success(service.createFromApprovedOrder(command));

firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformFbaMasterDataController.java

@@ -75,19 +75,20 @@ public class PlatformFbaMasterDataController {
 
     @GetMapping("/carrier-rates")
     @PreAuthorize("hasAuthority('firstleg:fba-pricing:rate:view')")
-    @Operation(summary = "查询船司 FBA 价格版本", description = "默认查询全部企业；tenantId 可用于筛选目标企业")
+    @Operation(summary = "查询船司 FBA 价格版本", description = "查询平台公共价格；所有客户共享")
     public ApiResponse<List<CarrierFbaRateEntity>> rates(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) Long tenantId,
         @RequestParam(required = false) String rateCode) {
-        return ApiResponse.success(service.listRates(optionalPlatformTenant(user, tenantId), rateCode));
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.listRates(rateCode));
     }
 
     @GetMapping("/carrier-rates/{id}")
     @PreAuthorize("hasAuthority('firstleg:fba-pricing:rate:view')")
     public ApiResponse<CarrierFbaRateEntity> rate(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam long tenantId, @PathVariable long id) {
-        return ApiResponse.success(service.rate(FirstlegScopeGuard.platform(user, tenantId), id));
+        @AuthenticationPrincipal AuthenticatedUser user, @PathVariable long id) {
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.rate(id));
     }
 
     @PostMapping("/carrier-rates/versions")
@@ -95,10 +96,10 @@ public class PlatformFbaMasterDataController {
     @BusinessAudit(event = "FBA_RATE_VERSION_CREATE", resourceType = "CARRIER_FBA_RATE",
         description = "创建船司FBA价格版本")
     public ApiResponse<CarrierFbaRateEntity> createRate(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam long tenantId,
+        @AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody CarrierRateVersionRequest request) {
-        long scope = FirstlegScopeGuard.platform(user, tenantId);
-        return ApiResponse.success(service.createRateVersion(scope, user.userId(), request));
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.createRateVersion(user.userId(), request));
     }
 
     @DeleteMapping("/carrier-rates/{id}")
@@ -106,8 +107,9 @@ public class PlatformFbaMasterDataController {
     @BusinessAudit(event = "FBA_RATE_RETIRE", resourceType = "CARRIER_FBA_RATE", resourceId = "#id",
         description = "停用船司FBA价格版本")
     public ApiResponse<Void> retireRate(@AuthenticationPrincipal AuthenticatedUser user,
-                                        @RequestParam long tenantId, @PathVariable long id) {
-        service.retireRate(FirstlegScopeGuard.platform(user, tenantId), id, user.userId());
+                                        @PathVariable long id) {
+        FirstlegScopeGuard.platform(user);
+        service.retireRate(id, user.userId());
         return ApiResponse.success(null);
     }
 

firstleg/src/main/java/com/baiyue/firstleg/dto/OrderApprovedInboundCommand.java

@@ -7,6 +7,7 @@ public record OrderApprovedInboundCommand(
     long tenantId,
     long orderId,
     String orderNo,
+    String inboundCode,
     Long customerId,
     String customerName,
     Long warehouseId,

firstleg/src/main/java/com/baiyue/firstleg/entity/CarrierFbaRateEntity.java

@@ -15,6 +15,9 @@ import java.time.LocalDateTime;
 @Setter
 @TableName("fl_carrier_fba_rate")
 public class CarrierFbaRateEntity extends BaseEntity {
+    /** 船司价格是平台公共主数据，不绑定任何客户。 */
+    public static final long PLATFORM_SCOPE = 0L;
+
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     private Long tenantId;

firstleg/src/main/java/com/baiyue/firstleg/repository/FbaPricingRepository.java

@@ -50,9 +50,9 @@ public class FbaPricingRepository {
             .eq(CustomerChargeRuleEntity::getId, id));
     }
 
-    public CarrierFbaRateEntity findRate(long tenantId, long id) {
+    public CarrierFbaRateEntity findRate(long id) {
         return rates.selectOne(new LambdaQueryWrapper<CarrierFbaRateEntity>()
-            .eq(CarrierFbaRateEntity::getTenantId, tenantId)
+            .eq(CarrierFbaRateEntity::getTenantId, CarrierFbaRateEntity.PLATFORM_SCOPE)
             .eq(CarrierFbaRateEntity::getId, id));
     }
 
@@ -64,21 +64,34 @@ public class FbaPricingRepository {
             .orderByDesc(CustomerChargeRuleEntity::getRuleVersion));
     }
 
-    public List<CarrierFbaRateEntity> listRates(Long tenantId, String rateCode) {
+    public List<CarrierFbaRateEntity> listRates(String rateCode) {
         return rates.selectList(new LambdaQueryWrapper<CarrierFbaRateEntity>()
-            .eq(tenantId != null, CarrierFbaRateEntity::getTenantId, tenantId)
+            .eq(CarrierFbaRateEntity::getTenantId, CarrierFbaRateEntity.PLATFORM_SCOPE)
             .eq(rateCode != null && !rateCode.isBlank(), CarrierFbaRateEntity::getRateCode, rateCode)
             .orderByAsc(CarrierFbaRateEntity::getRateCode)
             .orderByDesc(CarrierFbaRateEntity::getRateVersion));
     }
 
+    /**
+     * 在创建平台公共价格版本时锁定当前公共价格集合，串行化版本号和有效期检查。
+     * 调用方必须在事务中使用该方法。
+     */
+    public List<CarrierFbaRateEntity> listRatesForUpdate(String rateCode) {
+        return rates.selectList(new LambdaQueryWrapper<CarrierFbaRateEntity>()
+            .eq(CarrierFbaRateEntity::getTenantId, CarrierFbaRateEntity.PLATFORM_SCOPE)
+            .eq(rateCode != null && !rateCode.isBlank(), CarrierFbaRateEntity::getRateCode, rateCode)
+            .orderByAsc(CarrierFbaRateEntity::getRateCode)
+            .orderByDesc(CarrierFbaRateEntity::getRateVersion)
+            .last("FOR UPDATE"));
+    }
+
     public int nextRuleVersion(long tenantId, String ruleCode) {
         List<CustomerChargeRuleEntity> values = listRules(tenantId, ruleCode);
         return values.isEmpty() ? 1 : values.get(0).getRuleVersion() + 1;
     }
 
-    public int nextRateVersion(long tenantId, String rateCode) {
-        List<CarrierFbaRateEntity> values = listRates(tenantId, rateCode);
+    public int nextRateVersion(String rateCode) {
+        List<CarrierFbaRateEntity> values = listRatesForUpdate(rateCode);
         return values.isEmpty() ? 1 : values.get(0).getRateVersion() + 1;
     }
 
@@ -91,9 +104,9 @@ public class FbaPricingRepository {
             .set(CustomerChargeRuleEntity::getUpdatedBy, operatorId));
     }
 
-    public int retireRate(long tenantId, long id, long operatorId) {
+    public int retireRate(long id, long operatorId) {
         return rates.update(null, new LambdaUpdateWrapper<CarrierFbaRateEntity>()
-            .eq(CarrierFbaRateEntity::getTenantId, tenantId)
+            .eq(CarrierFbaRateEntity::getTenantId, CarrierFbaRateEntity.PLATFORM_SCOPE)
             .eq(CarrierFbaRateEntity::getId, id)
             .eq(CarrierFbaRateEntity::getStatus, "ACTIVE")
             .set(CarrierFbaRateEntity::getStatus, "INACTIVE")
@@ -121,7 +134,7 @@ public class FbaPricingRepository {
     public List<CarrierFbaRateEntity> matchRates(InboundPricingEntity inbound, String chargeUnit,
                                                   LocalDateTime at) {
         return rates.selectList(new LambdaQueryWrapper<CarrierFbaRateEntity>()
-            .eq(CarrierFbaRateEntity::getTenantId, inbound.getTenantId())
+            .eq(CarrierFbaRateEntity::getTenantId, CarrierFbaRateEntity.PLATFORM_SCOPE)
             .eq(CarrierFbaRateEntity::getOriginWarehouseId, inbound.getWarehouseId())
             .eq(CarrierFbaRateEntity::getBusinessType, inbound.getBusinessType())
             .eq(CarrierFbaRateEntity::getChannelCode, inbound.getChannelCode())
@@ -188,15 +201,17 @@ public class FbaPricingRepository {
             .set(InboundFeeEntity::getUpdatedAt, LocalDateTime.now()));
     }
 
-    public int markInboundCalculated(long tenantId, long inboundId, String chargeMode,
+    public int markInboundCalculated(long tenantId, long inboundId, String processStatus, String chargeMode,
                                      java.math.BigDecimal chargeable) {
         LambdaUpdateWrapper<InboundPricingEntity> update = new LambdaUpdateWrapper<InboundPricingEntity>()
             .eq(InboundPricingEntity::getTenantId, tenantId)
             .eq(InboundPricingEntity::getId, inboundId)
-            .in(InboundPricingEntity::getProcessStatus, List.of("WAIT_PRICING", "FEE_CONFIRMING"))
+            .eq(InboundPricingEntity::getProcessStatus, processStatus)
             .in(InboundPricingEntity::getFeeStatus, List.of("UNPRICED", "CALCULATED"))
-            .set(InboundPricingEntity::getProcessStatus, "FEE_CONFIRMING")
             .set(InboundPricingEntity::getFeeStatus, "CALCULATED");
+        if (!"WAIT_SPLIT".equals(processStatus)) {
+            update.set(InboundPricingEntity::getProcessStatus, "FEE_CONFIRMING");
+        }
         if ("KG".equals(chargeMode)) update.set(InboundPricingEntity::getChargeableWeightKg, chargeable);
         else update.set(InboundPricingEntity::getChargeableVolumeCbm, chargeable);
         return inbounds.update(null, update);
@@ -214,7 +229,7 @@ public class FbaPricingRepository {
     public int markInboundConfirmed(long tenantId, long inboundId) {
         return inbounds.update(null, new LambdaUpdateWrapper<InboundPricingEntity>()
             .eq(InboundPricingEntity::getTenantId, tenantId).eq(InboundPricingEntity::getId, inboundId)
-            .eq(InboundPricingEntity::getProcessStatus, "FEE_CONFIRMING")
+            .in(InboundPricingEntity::getProcessStatus, List.of("FEE_CONFIRMING", "WAIT_SPLIT"))
             .eq(InboundPricingEntity::getFeeStatus, "CALCULATED")
             .set(InboundPricingEntity::getFeeStatus, "CONFIRMED"));
     }

firstleg/src/main/java/com/baiyue/firstleg/service/FbaMasterDataService.java

@@ -59,10 +59,9 @@ public class FbaMasterDataService {
     }
 
     @Transactional
-    public CarrierFbaRateEntity createRateVersion(long tenantId, long operatorId,
-                                                   CarrierRateVersionRequest request) {
+    public CarrierFbaRateEntity createRateVersion(long operatorId, CarrierRateVersionRequest request) {
         validatePeriod(request.effectiveFrom(), request.effectiveTo());
-        boolean overlaps = repository.listRates(tenantId, null).stream()
+        boolean overlaps = repository.listRatesForUpdate(null).stream()
             .filter(v -> "ACTIVE".equals(v.getStatus()))
             .filter(v -> Objects.equals(v.getOriginWarehouseId(), request.originWarehouseId()))
             .filter(v -> Objects.equals(v.getBusinessType(), request.businessType()))
@@ -75,9 +74,9 @@ public class FbaMasterDataService {
         if (overlaps) throw conflict("船司 FBA 价格有效期重叠，无法保证唯一匹配");
 
         CarrierFbaRateEntity value = new CarrierFbaRateEntity();
-        value.setTenantId(tenantId);
+        value.setTenantId(CarrierFbaRateEntity.PLATFORM_SCOPE);
         value.setRateCode(request.rateCode());
-        value.setRateVersion(repository.nextRateVersion(tenantId, request.rateCode()));
+        value.setRateVersion(repository.nextRateVersion(request.rateCode()));
         value.setOriginWarehouseId(request.originWarehouseId());
         value.setOriginWarehouseName(request.originWarehouseName());
         value.setBusinessType(request.businessType());
@@ -103,8 +102,8 @@ public class FbaMasterDataService {
         return repository.listRules(tenantId, code);
     }
 
-    public List<CarrierFbaRateEntity> listRates(Long tenantId, String code) {
-        return repository.listRates(tenantId, code);
+    public List<CarrierFbaRateEntity> listRates(String code) {
+        return repository.listRates(code);
     }
 
     public CustomerChargeRuleEntity rule(long tenantId, long id) {
@@ -113,8 +112,8 @@ public class FbaMasterDataService {
         return value;
     }
 
-    public CarrierFbaRateEntity rate(long tenantId, long id) {
-        CarrierFbaRateEntity value = repository.findRate(tenantId, id);
+    public CarrierFbaRateEntity rate(long id) {
+        CarrierFbaRateEntity value = repository.findRate(id);
         if (value == null) throw new BizException(ResultCode.NOT_FOUND, "船司 FBA 价格版本不存在");
         return value;
     }
@@ -125,8 +124,8 @@ public class FbaMasterDataService {
     }
 
     @Transactional
-    public void retireRate(long tenantId, long id, long operatorId) {
-        if (repository.retireRate(tenantId, id, operatorId) != 1) throw conflict("价格已停用或不存在");
+    public void retireRate(long id, long operatorId) {
+        if (repository.retireRate(id, operatorId) != 1) throw conflict("价格已停用或不存在");
     }
 
     private static void validatePeriod(LocalDateTime from, LocalDateTime to) {

firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java

@@ -47,7 +47,7 @@ public class FbaPricingService {
         String hash = hash("CALCULATE", inboundId, requestedAt == null ? "CURRENT" : requestedAt.toString());
         InboundPricingIdempotencyEntity token = beginIdempotency(
             tenantId, operatorId, inboundId, "FEE_CALCULATE", idempotencyKey, hash);
-        if ("COMPLETED".equals(token.getStatus())) return response(tenantId, token.getResultResourceId(), "FEE_CONFIRMING");
+        if ("COMPLETED".equals(token.getStatus())) return response(tenantId, token.getResultResourceId(), null);
 
         InboundPricingEntity inbound = requireEligibleInbound(tenantId, inboundId);
         List<CustomerChargeRuleEntity> matchedRules = repository.matchRules(inbound, pricingAt);
@@ -88,11 +88,14 @@ public class FbaPricingService {
         repository.insertFee(fee);
         repository.insertItem(baseItem(tenantId, fee, rate, chargeable, subtotal, now));
         if (additional.signum() > 0) repository.insertItem(additionalItem(tenantId, fee, additional, now));
-        if (repository.markInboundCalculated(tenantId, inboundId, rule.getChargeMode(), chargeable) != 1) {
+        if (repository.markInboundCalculated(tenantId, inboundId, inbound.getProcessStatus(),
+                rule.getChargeMode(), chargeable) != 1) {
             throw conflict("入库单状态已变化，费用试算未保存");
         }
         complete(token, fee.getId(), now);
-        return response(inbound, fee, rate.getUnitPrice(), "FEE_CONFIRMING");
+        String nextStatus = "WAIT_SPLIT".equals(inbound.getProcessStatus())
+            ? "WAIT_SPLIT" : "FEE_CONFIRMING";
+        return response(inbound, fee, rate.getUnitPrice(), nextStatus);
     }
 
     @Transactional
@@ -103,14 +106,14 @@ public class FbaPricingService {
         String hash = hash("CONFIRM", inboundId, current.getId().toString());
         InboundPricingIdempotencyEntity token = beginIdempotency(
             tenantId, operatorId, inboundId, "FEE_CONFIRM", idempotencyKey, hash);
-        if ("COMPLETED".equals(token.getStatus())) return response(tenantId, token.getResultResourceId(), "FEE_CONFIRMING");
+        if ("COMPLETED".equals(token.getStatus())) return response(tenantId, token.getResultResourceId(), null);
         LocalDateTime now = LocalDateTime.now(clock);
         if (repository.confirmFee(tenantId, current.getId(), operatorId, now) != 1
             || repository.markInboundConfirmed(tenantId, inboundId) != 1) {
             throw conflict("费用或入库单状态已变化，不能重复确认");
         }
         complete(token, current.getId(), now);
-        return response(tenantId, current.getId(), "FEE_CONFIRMING");
+        return response(tenantId, current.getId(), null);
     }
 
     @Transactional
@@ -232,7 +235,7 @@ public class FbaPricingService {
 
     private InboundPricingEntity requireEligibleInbound(long tenantId, long inboundId) {
         InboundPricingEntity inbound = requireApprovedInbound(tenantId, inboundId);
-        if (!List.of("WAIT_PRICING", "FEE_CONFIRMING").contains(inbound.getProcessStatus())
+        if (!List.of("WAIT_PRICING", "FEE_CONFIRMING", "WAIT_SPLIT").contains(inbound.getProcessStatus())
             || !List.of("UNPRICED", "CALCULATED").contains(inbound.getFeeStatus())) {
             throw conflict("当前入库单状态不允许费用试算");
         }

firstleg/src/main/java/com/baiyue/firstleg/service/InboundOrderCreationService.java

@@ -38,7 +38,7 @@ public class InboundOrderCreationService {
         inbound.setTenantId(command.tenantId());
         inbound.setOrderId(command.orderId());
         inbound.setOrderNo(command.orderNo());
-        inbound.setInboundCode("RK-" + command.orderId());
+        inbound.setInboundCode(command.inboundCode());
         inbound.setProcessStatus("WAIT_MEASURE");
         inbound.setOrderStatusSnapshot("APPROVED");
         inbound.setMeasureReviewStatus("NOT_SUBMITTED");

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -309,8 +309,8 @@ CREATE TABLE IF NOT EXISTS fl_customer_charge_rule (
 
 CREATE TABLE IF NOT EXISTS fl_carrier_fba_rate (
   id BIGINT UNSIGNED NOT NULL COMMENT '船司FBA价格ID',
-  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '数据所属租户ID',
-  rate_code VARCHAR(50) NOT NULL COMMENT '租户内价格编码',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台价格作用域ID，船司价格固定为0',
+  rate_code VARCHAR(50) NOT NULL COMMENT '平台公共价格编码',
   rate_version INT UNSIGNED NOT NULL COMMENT '价格版本号',
   origin_warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '起运仓逻辑ID',
   origin_warehouse_name VARCHAR(128) NOT NULL COMMENT '起运仓名称快照',

firstleg/src/main/resources/openapi/fba-pricing-v1.yaml

@@ -32,43 +32,42 @@ paths:
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates:
     get:
-      summary: 查询船司 FBA 价格版本
+      summary: 查询平台公共船司 FBA 价格版本
       description: 需要 firstleg:fba-pricing:rate:view 权限
       parameters:
-        - {$ref: '#/components/parameters/OptionalTenantId'}
         - {name: rateCode, in: query, schema: {type: string, maxLength: 50}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates/versions:
     post:
-      summary: 新建船司 FBA 价格版本
-      parameters: [{$ref: '#/components/parameters/TenantId'}]
+      summary: 新建平台公共船司 FBA 价格版本
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CarrierRateVersionRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates/{id}:
     get:
       summary: 查询船司 FBA 价格版本详情
-      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      parameters: [{$ref: '#/components/parameters/Id'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
     delete:
       summary: 停用船司 FBA 价格版本
-      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      parameters: [{$ref: '#/components/parameters/Id'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/calculate:
     post:
       summary: 按审核通过测量快照试算 FBA 费用
-      description: 精确匹配唯一客户规则和唯一船司价格；需要 firstleg:fba-pricing:calculate 权限。
+      description: 精确匹配唯一客户规则和唯一船司价格；测量审核后即使主流程已到 WAIT_SPLIT，也可独立试算且不回退主流程状态；需要 firstleg:fba-pricing:calculate 权限。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {content: {application/json: {schema: {$ref: '#/components/schemas/CalculateRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/confirm:
     post:
       summary: 确认最新费用快照
+      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/send:
     post:
-      summary: 手工恢复发送费用快照
-      description: 仅作为异常恢复接口；正常业务由客服测量审核通过后自动计费、发布并完成入库。
+      summary: 发送已确认费用快照
+      description: 该动作涉及后续仓储流程，本轮二期验收不调用。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/latest:

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -6,6 +6,19 @@ info:
 security:
   - bearerAuth: []
 paths:
+  /internal/firstleg/v1/inbounds/order-approved:
+    post:
+      summary: 订单审核通过后幂等创建入库单
+      description: 仅供订单服务调用；入仓码由订单提交时生成，Firstleg 必须原样沿用。承运商可在后续履约或计费前补充。
+      security:
+        - internalServiceToken: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/OrderApprovedInboundCommand'}
+      responses:
+        '200': {description: 成功或业务失败；相同客户和订单重放返回已有入库单 ID}
   /api/platform/v1/first-leg/tasks:
     get:
       summary: 分页查询履约任务
@@ -308,6 +321,10 @@ components:
       in: header
       name: X-Signature
       description: HMAC-SHA256 小写十六进制签名
+    internalServiceToken:
+      type: apiKey
+      in: header
+      name: X-Internal-Service-Token
   parameters:
     XTimestamp:
       name: X-Timestamp
@@ -348,6 +365,36 @@ components:
       required: true
       schema: {type: string, pattern: '^[1-9][0-9]*$'}
   schemas:
+    OrderApprovedInboundCommand:
+      type: object
+      required: [tenantId, orderId, inboundCode, customerName, warehouseId]
+      properties:
+        tenantId: {type: string, pattern: '^[1-9][0-9]*$', description: 当前客户隔离 ID}
+        orderId: {type: string, pattern: '^[1-9][0-9]*$'}
+        orderNo: {type: string, nullable: true}
+        inboundCode: {type: string, minLength: 1, maxLength: 40, example: RK-2085308606829346818}
+        customerId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        customerName: {type: string, minLength: 1}
+        warehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
+        warehouseName: {type: string, nullable: true}
+        deliveryWarehouseId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        deliveryWarehouseName: {type: string, nullable: true}
+        expectedArrivalAt: {type: string, format: date-time, nullable: true}
+        businessType: {type: string, nullable: true}
+        channelCode: {type: string, nullable: true}
+        channelName: {type: string, nullable: true}
+        carrierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 可选，可在后续履约或计费前补充}
+        carrierName: {type: string, nullable: true}
+        taxMode: {type: string, nullable: true}
+        containerMode: {type: string, nullable: true}
+        customsInspection: {type: boolean, nullable: true}
+        destinationType: {type: string, nullable: true}
+        destinationWarehouseId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        destinationCode: {type: string, nullable: true}
+        destinationName: {type: string, nullable: true}
+        publicRemark: {type: string, nullable: true}
+        expressCompanyName: {type: string, nullable: true}
+        expressTrackingNo: {type: string, nullable: true}
     ContainerBookingPageEnvelope:
       type: object
       properties:

firstleg/src/test/java/com/baiyue/firstleg/controller/FbaPricingContractTest.java

@@ -13,24 +13,30 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DisplayName("FBA计费OpenAPI契约")
 class FbaPricingContractTest {
     @Test
-    @DisplayName("只有基础资料列表允许省略企业参数")
-    void onlyMasterDataListsAllowOptionalTenant() {
-        for (String listMethod : new String[] {"rules", "rates"}) {
-            Method method = method(listMethod);
-            assertThat(method.getParameterTypes()[1]).isEqualTo(Long.class);
-            assertThat(method.getParameters()[1].getAnnotation(RequestParam.class).required()).isFalse();
-        }
+    @DisplayName("客户规则保留客户参数，船司价格使用平台公共作用域")
+    void keepsCustomerRuleScopeAndRemovesCarrierRateTenantScope() {
+        Method rules = method("rules");
+        assertThat(rules.getParameterTypes()[1]).isEqualTo(Long.class);
+        assertThat(rules.getParameters()[1].getAnnotation(RequestParam.class).required()).isFalse();
 
-        for (String scopedMethod : new String[] {"rule", "createRule", "retireRule",
-            "rate", "createRate", "retireRate"}) {
+        Method rates = method("rates");
+        assertThat(rates.getParameterTypes()).doesNotContain(Long.class);
+
+        for (String scopedMethod : new String[] {"rule", "createRule", "retireRule"}) {
             Method method = method(scopedMethod);
             assertThat(method.getParameterTypes()[1]).isEqualTo(long.class);
             assertThat(method.getParameters()[1].getAnnotation(RequestParam.class).required()).isTrue();
         }
+
+        for (String publicMethod : new String[] {"rate", "createRate", "retireRate"}) {
+            assertThat(java.util.Arrays.stream(method(publicMethod).getParameters())
+                .map(parameter -> parameter.getAnnotation(RequestParam.class)))
+                .allMatch(annotation -> annotation == null);
+        }
     }
 
     @Test
-    @DisplayName("契约声明自动发布、已发布费用调整和幂等头")
+    @DisplayName("契约声明二期边界计费、已发布费用调整和幂等头")
     void documentsPricingLifecycle() throws Exception {
         String openapi = new ClassPathResource("openapi/fba-pricing-v1.yaml")
             .getContentAsString(StandardCharsets.UTF_8);
@@ -42,7 +48,8 @@ class FbaPricingContractTest {
             .contains("/api/platform/v1/inbounds/{inboundId}/fees/send:")
             .contains("/api/platform/v1/inbounds/{inboundId}/fees/published:")
             .contains("Idempotency-Key")
-            .contains("客服测量审核通过后自动计费、发布并完成入库")
+            .contains("主流程已到 WAIT_SPLIT，也可独立试算且不回退主流程状态")
+            .contains("该动作涉及后续仓储流程，本轮二期验收不调用")
             .contains("不回退 INBOUNDED 状态")
             .doesNotContain("应收")
             .doesNotContain("应付")
@@ -62,7 +69,7 @@ class FbaPricingContractTest {
             openapi.indexOf("/api/platform/v1/fba-pricing/carrier-rates:"),
             openapi.indexOf("/api/platform/v1/fba-pricing/carrier-rates/versions:"));
         assertThat(carrierRates)
-            .contains("OptionalTenantId")
+            .doesNotContain("OptionalTenantId")
             .contains("name: rateCode");
         assertThat(openapi)
             .contains("OptionalTenantId: {name: tenantId, in: query, required: false")

firstleg/src/test/java/com/baiyue/firstleg/controller/InternalInboundOrderReferenceControllerTest.java

@@ -2,6 +2,7 @@ package com.baiyue.firstleg.controller;
 
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.firstleg.dto.InboundOrderReference;
+import com.baiyue.firstleg.dto.OrderApprovedInboundCommand;
 import com.baiyue.firstleg.service.InboundOrderCreationService;
 import com.baiyue.firstleg.service.UnifiedInboundQueryService;
 import com.baiyue.firstleg.dto.UnifiedInboundQuery;
@@ -63,4 +64,28 @@ class InternalInboundOrderReferenceControllerTest {
             .isInstanceOf(BizException.class);
         verify(unifiedQueryService).page(request);
     }
+
+    @Test
+    void approvedOrderRequiresInboundCode() {
+        assertThatThrownBy(() -> controller.createFromApprovedOrder(
+            "internal-token", approvedCommand(" ", null)))
+            .isInstanceOf(BizException.class);
+    }
+
+    @Test
+    void approvedOrderAllowsMissingCarrier() {
+        OrderApprovedInboundCommand command = approvedCommand("RK-77", null);
+        when(service.createFromApprovedOrder(command)).thenReturn(88L);
+
+        assertThat(controller.createFromApprovedOrder("internal-token", command).data()).isEqualTo(88L);
+        verify(service).createFromApprovedOrder(command);
+    }
+
+    private static OrderApprovedInboundCommand approvedCommand(String inboundCode, Long carrierId) {
+        return new OrderApprovedInboundCommand(
+            10001L, 77L, "FL-77", inboundCode, 7L, "测试客户", 9L, "义乌仓",
+            null, null, null, "FBA", "AIR", "空运", carrierId,
+            carrierId == null ? null : "承运商", null, null, null, null,
+            null, null, null, null, null, null);
+    }
 }

firstleg/src/test/java/com/baiyue/firstleg/repository/FbaPricingRepositoryRuleListTest.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baiyue.firstleg.entity.CustomerChargeRuleEntity;
 import com.baiyue.firstleg.entity.CarrierFbaRateEntity;
 import com.baiyue.firstleg.entity.InboundPricingIdempotencyEntity;
+import com.baiyue.firstleg.entity.InboundPricingEntity;
 import com.baiyue.firstleg.mapper.CarrierFbaRateMapper;
 import com.baiyue.firstleg.mapper.CustomerChargeRuleMapper;
 import com.baiyue.firstleg.mapper.InboundFeeItemMapper;
@@ -48,6 +49,8 @@ class FbaPricingRepositoryRuleListTest {
             CustomerChargeRuleEntity.class);
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new Configuration(), "test"),
             CarrierFbaRateEntity.class);
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new Configuration(), "test"),
+            InboundPricingEntity.class);
     }
 
     @Test
@@ -61,14 +64,52 @@ class FbaPricingRepositoryRuleListTest {
     }
 
     @Test
-    void platformRateListOmitsTenantConditionWhenTenantIsAbsent() {
-        assertThat(rateQueryValues(null, null)).isEmpty();
+    void platformRateListAlwaysUsesPublicScope() {
+        assertThat(rateQueryValues(null)).containsExactly(CarrierFbaRateEntity.PLATFORM_SCOPE);
     }
 
     @Test
-    void platformRateListKeepsTenantAndRateCodeFiltersWhenProvided() {
-        assertThat(rateQueryValues(10001L, "RATE-1"))
-            .containsExactlyInAnyOrder(10001L, "RATE-1");
+    void platformRateListKeepsPublicScopeAndRateCodeFiltersWhenProvided() {
+        assertThat(rateQueryValues("RATE-1"))
+            .containsExactlyInAnyOrder(CarrierFbaRateEntity.PLATFORM_SCOPE, "RATE-1");
+    }
+
+    @Test
+    void platformRateCreateQueryLocksPublicScope() {
+        when(rates.selectList(org.mockito.ArgumentMatchers.any())).thenReturn(List.of());
+
+        repository.listRatesForUpdate(null);
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<LambdaQueryWrapper<CarrierFbaRateEntity>> wrapper =
+            ArgumentCaptor.forClass(LambdaQueryWrapper.class);
+        verify(rates).selectList(wrapper.capture());
+        assertThat(wrapper.getValue().getCustomSqlSegment()).contains("FOR UPDATE");
+        assertThat(wrapper.getValue().getParamNameValuePairs().values())
+            .containsExactly(CarrierFbaRateEntity.PLATFORM_SCOPE);
+    }
+
+    @Test
+    void carrierRateMatchingAlwaysUsesPlatformScope() {
+        InboundPricingEntity inbound = new InboundPricingEntity();
+        inbound.setTenantId(10001L);
+        inbound.setWarehouseId(21L);
+        inbound.setBusinessType("FBA_SEA");
+        inbound.setChannelCode("SEA-TAX");
+        inbound.setCarrierId(31L);
+        inbound.setDestinationCode("ONT8");
+        when(rates.selectList(org.mockito.ArgumentMatchers.any())).thenReturn(List.of());
+
+        repository.matchRates(inbound, "KG", java.time.LocalDateTime.of(2026, 8, 1, 0, 0));
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<LambdaQueryWrapper<CarrierFbaRateEntity>> wrapper =
+            ArgumentCaptor.forClass(LambdaQueryWrapper.class);
+        verify(rates).selectList(wrapper.capture());
+        wrapper.getValue().getSqlSegment();
+        assertThat(wrapper.getValue().getParamNameValuePairs().values())
+            .contains(CarrierFbaRateEntity.PLATFORM_SCOPE)
+            .doesNotContain(10001L);
     }
 
     @Test
@@ -122,10 +163,10 @@ class FbaPricingRepositoryRuleListTest {
         return wrapper.getValue().getParamNameValuePairs().values();
     }
 
-    private Collection<Object> rateQueryValues(Long tenantId, String rateCode) {
+    private Collection<Object> rateQueryValues(String rateCode) {
         when(rates.selectList(org.mockito.ArgumentMatchers.any())).thenReturn(List.of());
 
-        repository.listRates(tenantId, rateCode);
+        repository.listRates(rateCode);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<LambdaQueryWrapper<CarrierFbaRateEntity>> wrapper =

firstleg/src/test/java/com/baiyue/firstleg/service/FbaMasterDataServiceTest.java

@@ -2,6 +2,8 @@ package com.baiyue.firstleg.service;
 
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.firstleg.dto.FbaPricingDtos.CustomerRuleVersionRequest;
+import com.baiyue.firstleg.dto.FbaPricingDtos.CarrierRateVersionRequest;
+import com.baiyue.firstleg.entity.CarrierFbaRateEntity;
 import com.baiyue.firstleg.entity.CustomerChargeRuleEntity;
 import com.baiyue.firstleg.repository.FbaPricingRepository;
 import jakarta.annotation.Resource;
@@ -73,11 +75,33 @@ class FbaMasterDataServiceTest {
             .hasMessageContaining("有效期重叠");
     }
 
+    @Test
+    @DisplayName("船司价格版本固定写入平台公共作用域")
+    void createsCarrierRateInPlatformScope() {
+        when(repository.listRatesForUpdate(null)).thenReturn(List.of());
+        when(repository.nextRateVersion("RATE-1")).thenReturn(1);
+        doAnswer(invocation -> { ((CarrierFbaRateEntity) invocation.getArgument(0)).setId(20L); return null; })
+            .when(repository).insertRate(any());
+
+        CarrierFbaRateEntity created = service.createRateVersion(2L, carrierRateRequest());
+
+        assertThat(created.getTenantId()).isEqualTo(CarrierFbaRateEntity.PLATFORM_SCOPE);
+        verify(repository).listRatesForUpdate(null);
+        verify(repository).nextRateVersion("RATE-1");
+        verify(repository).insertRate(any());
+    }
+
     private CustomerRuleVersionRequest request(LocalDateTime from, LocalDateTime to) {
         return new CustomerRuleVersionRequest("CR-1", 100L, "客户A", "FBA_SEA", "KG",
             "TAX_INCLUDED", new BigDecimal("167"), 3, "CEILING", "USD", from, to, null);
     }
 
+    private CarrierRateVersionRequest carrierRateRequest() {
+        return new CarrierRateVersionRequest("RATE-1", 21L, "义乌仓", "FBA_SEA", "SEA-TAX",
+            31L, "船司A", "ONT8", "KG", new BigDecimal("2.50"), "USD", new BigDecimal("10"),
+            AUGUST, null, null);
+    }
+
     private CustomerChargeRuleEntity activeRule(LocalDateTime from, LocalDateTime to) {
         CustomerChargeRuleEntity value = new CustomerChargeRuleEntity();
         value.setRuleCode("CR-1"); value.setRuleVersion(1); value.setCustomerId(100L);

firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java

@@ -100,6 +100,51 @@ class FbaPricingServiceTest {
         assertThat(response.totalAmount()).isEqualByComparingTo("100.01");
     }
 
+    @Test
+    @DisplayName("待分柜边界可独立计费且不回退主流程状态")
+    void calculatesAtWaitSplitWithoutRollingBackProcessStatus() {
+        readyRepository();
+        InboundPricingEntity inbound = inbound("100.000", "1.0000");
+        inbound.setProcessStatus("WAIT_SPLIT");
+        CustomerChargeRuleEntity rule = rule("KG", "167.000000", 3, "CEILING");
+        CarrierFbaRateEntity rate = rate("KG", "2.000000", "0.00");
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
+        when(repository.matchRules(inbound, NOW)).thenReturn(List.of(rule));
+        when(repository.matchRates(inbound, "KG", NOW)).thenReturn(List.of(rate));
+
+        FeeSnapshotResponse response = service.calculate(TENANT, OPERATOR, INBOUND, NOW, "wait-split");
+
+        assertThat(response.feeStatus()).isEqualTo("CALCULATED");
+        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_SPLIT");
+        verify(repository).markInboundCalculated(TENANT, INBOUND, "WAIT_SPLIT", "KG",
+            new BigDecimal("167.000"));
+    }
+
+    @Test
+    @DisplayName("待分柜边界确认费用后仍保持主流程状态")
+    void confirmsAtWaitSplitWithoutRollingBackProcessStatus() {
+        InboundPricingEntity inbound = inbound("10.000", "1.0000");
+        inbound.setProcessStatus("WAIT_SPLIT");
+        inbound.setFeeStatus("CALCULATED");
+        InboundFeeEntity fee = savedFee("CALCULATED");
+        when(repository.findLatestFee(TENANT, INBOUND)).thenReturn(fee);
+        when(repository.findIdempotency(TENANT, OPERATOR, "FEE_CONFIRM", "confirm-wait-split"))
+            .thenReturn(null);
+        doAnswer(invocation -> { ((InboundPricingIdempotencyEntity) invocation.getArgument(0)).setId(900L); return null; })
+            .when(repository).insertIdempotency(any());
+        when(repository.confirmFee(TENANT, 501L, OPERATOR, NOW)).thenReturn(1);
+        when(repository.markInboundConfirmed(TENANT, INBOUND)).thenReturn(1);
+        when(repository.completeIdempotency(any(), eq(501L), eq(NOW))).thenReturn(1);
+        when(repository.findFee(TENANT, 501L)).thenReturn(fee);
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
+
+        FeeSnapshotResponse response = service.confirm(
+            TENANT, OPERATOR, INBOUND, "confirm-wait-split");
+
+        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_SPLIT");
+        verify(repository).markInboundConfirmed(TENANT, INBOUND);
+    }
+
     @Test
     @DisplayName("审核未通过的测量快照禁止计费")
     void rejectsUnapprovedMeasurementSnapshot() {
@@ -137,15 +182,18 @@ class FbaPricingServiceTest {
     @DisplayName("同一幂等键重复试算直接返回原费用快照")
     void returnsOriginalSnapshotForRepeatedCalculation() {
         InboundPricingIdempotencyEntity completed = completed("FEE_CALCULATE", 501L);
+        InboundPricingEntity inbound = inbound("10", "1");
+        inbound.setProcessStatus("WAIT_SPLIT");
         when(repository.findIdempotency(TENANT, OPERATOR, "FEE_CALCULATE", "same")).thenReturn(completed);
         when(repository.findFee(TENANT, 501L)).thenReturn(savedFee("CALCULATED"));
-        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound("10", "1"));
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
         InboundFeeItemEntity item = new InboundFeeItemEntity(); item.setUnitPrice(new BigDecimal("2.00"));
         when(repository.findBaseItem(TENANT, 501L)).thenReturn(item);
 
         FeeSnapshotResponse response = service.calculate(TENANT, OPERATOR, INBOUND, NOW, "same");
 
         assertThat(response.feeId()).isEqualTo(501L);
+        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_SPLIT");
         verify(repository, never()).matchRules(any(), any());
         verify(repository, never()).insertFee(any());
     }
@@ -233,7 +281,7 @@ class FbaPricingServiceTest {
         doAnswer(invocation -> { ((InboundFeeEntity) invocation.getArgument(0)).setId(501L); return null; })
             .when(repository).insertFee(any());
         when(repository.nextFeeVersion(TENANT, INBOUND)).thenReturn(1);
-        when(repository.markInboundCalculated(eq(TENANT), eq(INBOUND), any(), any())).thenReturn(1);
+        when(repository.markInboundCalculated(eq(TENANT), eq(INBOUND), any(), any(), any())).thenReturn(1);
         when(repository.completeIdempotency(any(), eq(501L), eq(NOW))).thenReturn(1);
     }
 

firstleg/src/test/java/com/baiyue/firstleg/service/InboundOrderCreationServiceTest.java

@@ -0,0 +1,59 @@
+package com.baiyue.firstleg.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baiyue.firstleg.dto.OrderApprovedInboundCommand;
+import com.baiyue.firstleg.entity.InboundOrderEntity;
+import com.baiyue.firstleg.entity.InboundStatusHistoryEntity;
+import com.baiyue.firstleg.mapper.InboundOrderMapper;
+import com.baiyue.firstleg.mapper.InboundStatusHistoryMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class InboundOrderCreationServiceTest {
+    @Mock
+    private InboundOrderMapper orders;
+    @Mock
+    private InboundStatusHistoryMapper histories;
+    @InjectMocks
+    private InboundOrderCreationService service;
+
+    @Test
+    void shouldUseSubmittedInboundCodeAndKeepReplayIdempotentWithoutCarrier() {
+        OrderApprovedInboundCommand command = approvedCommand("RK-CUSTOM-77");
+        InboundOrderEntity existing = new InboundOrderEntity();
+        existing.setId(900L);
+        existing.setTenantId(10001L);
+        existing.setOrderId(77L);
+        existing.setInboundCode("RK-CUSTOM-77");
+        when(orders.selectOne(any(Wrapper.class))).thenReturn(null, existing);
+
+        long createdId = service.createFromApprovedOrder(command);
+        long replayedId = service.createFromApprovedOrder(command);
+
+        ArgumentCaptor<InboundOrderEntity> inboundCaptor = ArgumentCaptor.forClass(InboundOrderEntity.class);
+        verify(orders, times(1)).insert(inboundCaptor.capture());
+        verify(histories, times(1)).insert(any(InboundStatusHistoryEntity.class));
+        assertThat(inboundCaptor.getValue().getInboundCode()).isEqualTo("RK-CUSTOM-77");
+        assertThat(inboundCaptor.getValue().getCarrierId()).isNull();
+        assertThat(createdId).isEqualTo(inboundCaptor.getValue().getId());
+        assertThat(replayedId).isEqualTo(900L);
+    }
+
+    private static OrderApprovedInboundCommand approvedCommand(String inboundCode) {
+        return new OrderApprovedInboundCommand(
+            10001L, 77L, "FL-77", inboundCode, 7L, "测试客户", 9L, "义乌仓",
+            null, null, null, "FBA", "AIR", "空运", null, null,
+            null, null, null, null, null, null, null, null, null, null);
+    }
+}