Merge remote-tracking branch 'origin/test' into dev

# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
#	lastleg-service/src/main/resources/db/lastleg.sql

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

@@ -12,6 +12,10 @@ paths:
       description: 需要 firstleg:fba-pricing:rule:view 权限
       parameters:
         - {$ref: '#/components/parameters/OptionalTenantId'}
+        - name: customerId
+          in: query
+          required: false
+          schema: {type: integer, format: int64, minimum: 1}
         - {name: ruleCode, in: query, schema: {type: string, maxLength: 50}}
       responses:
         '200':
@@ -23,10 +27,16 @@ paths:
   /api/platform/v1/fba-pricing/customer-rules/versions:
     post:
       summary: 新建客户计费规则版本
-      description: 版本内容不可原地修改；有效期使用 [effectiveFrom,effectiveTo) 半开区间。
+      description: 新增配置固定为未启用，可保存有效期重叠的多条配置；保存后通过设置默认规则接口启用其中一条。
       parameters: [{$ref: '#/components/parameters/TenantId'}]
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CustomerRuleVersionRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
+  /api/platform/v1/fba-pricing/customer-rules/{id}/default:
+    put:
+      summary: 启用客户计费规则
+      description: 将指定配置设为当前客户唯一默认生效规则，并取消原默认规则。
+      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/customer-rules/{id}:
     get:
       summary: 查询客户计费规则版本详情
@@ -137,13 +147,13 @@ paths:
   /api/platform/v1/inbounds/{inboundId}/fees/confirm:
     post:
       summary: 确认最新费用快照
-      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
+      description: 需要 firstleg:inbound:confirm-send-fee 或兼容权限 firstleg:fba-pricing:confirm。确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败, content: {application/json: {schema: {$ref: '#/components/schemas/FeeSnapshotApiResponse'}}}}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/send:
     post:
       summary: 发送已确认费用快照
-      description: 人工发布当前已确认版本；仅此动作将费用置为 SENT、生成 PUBLISHED 的 FBA_PRICING 只读派生明细并写入 Finance Outbox。入库单已到 WAIT_SPLIT 时不得回退或阻塞主流程。
+      description: 需要 firstleg:inbound:confirm-send-fee 或兼容权限 firstleg:inbound:send-fee。人工发布当前已确认版本；仅此动作将费用置为 SENT、生成 PUBLISHED 的 FBA_PRICING 只读派生明细并写入 Finance Outbox。入库单已到 WAIT_SPLIT 时不得回退或阻塞主流程。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败, content: {application/json: {schema: {$ref: '#/components/schemas/FeeSnapshotApiResponse'}}}}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/latest:

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

@@ -168,6 +168,20 @@ paths:
       responses:
         '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
         '403': {description: 无编辑权限}
+  /api/platform/v1/first-leg/customer-dimension-config/default-calculation-mode:
+    put:
+      summary: 设置客户订单外箱规默认计算方式
+      description: 需要 firstleg:dimension-config:edit 权限；ADD 表示按箱规尺寸加宽，MULTIPLY 表示按默认权重系数计算。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/CustomerDimensionDefaultCalculationModeUpdateRequest'}
+      responses:
+        '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
+        '403': {description: 无编辑权限}
   /internal/firstleg/v1/inbounds/order-approved:
     post:
       summary: 订单审核通过后幂等创建入库单
@@ -762,7 +776,8 @@ paths:
     post:
       summary: 平台模拟单箱设备扫描
       description: >-
-        需要 platform:firstleg:inbound:measure:edit 权限；仅用于平台联调和代设备录入，
+        需要 platform:firstleg:inbound:warehouse-suggestion:edit 或兼容权限
+        platform:firstleg:inbound:measure:edit；仅用于平台联调和代设备录入，
         复用正式单箱覆盖规则，不代表最终第三方设备协议或鉴权方式。
       parameters:
         - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1354,6 +1369,11 @@ components:
           maxItems: 4
           description: 必须恰好包含 SMALL、MEDIUM、LARGE、EXTRA_LARGE 各一行
           items: {$ref: '#/components/schemas/CustomerDimensionConfigRuleUpdateRequest'}
+    CustomerDimensionDefaultCalculationModeUpdateRequest:
+      type: object
+      required: [defaultCalculationMode]
+      properties:
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
     CustomerDimensionConfigRuleUpdateRequest:
       type: object
       required: [boxType, innerLengthCm, innerWidthCm, innerHeightCm, edgeAdditionCm, version]
@@ -1373,9 +1393,10 @@ components:
         version: {type: integer, minimum: 0, description: 乐观锁版本号}
     CustomerDimensionConfigGroupResponse:
       type: object
-      required: [tenantId, rules]
+      required: [tenantId, defaultCalculationMode, rules]
       properties:
         tenantId: {type: string, pattern: '^[1-9][0-9]*$'}
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
         rules:
           type: array
           minItems: 4
@@ -1508,6 +1529,8 @@ components:
         outerLengthCm: {type: number, format: double, nullable: true}
         outerWidthCm: {type: number, format: double, nullable: true}
         outerHeightCm: {type: number, format: double, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
         remark: {type: string, nullable: true}
         boxCode: {type: string, nullable: true}
         scannedShipmentId: {type: string, nullable: true}
@@ -1622,6 +1645,8 @@ components:
         outerLengthCm: {type: number, minimum: 0, nullable: true}
         outerWidthCm: {type: number, minimum: 0, nullable: true}
         outerHeightCm: {type: number, minimum: 0, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
         remark: {type: string, maxLength: 500, nullable: true}
     InboundMeasurementDetailEnvelope:
       type: object