Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test

2026-09-18 09:59:04 +08:00
parent 27d281d4b3 29f05b7b09
commit 13a8dde0a5
106 changed files with 5113 additions and 471 deletions
@@ -959,6 +959,75 @@ paths:
      security: [{ bearerAuth: [] }]
      parameters: [{ name: deliveryNo, in: path, required: true, schema: { type: string } }]
      responses: { '200': { description: 当前客户派送单详情 }, '403': { description: 缺少客户派送查看权限 }, '404': { description: 当前客户下派送单不存在 } }
+  /api/merchant/v1/last-leg/orders:
+    get:
+      summary: 客户分页查询自己的海外尾程订单
+      description: 权限 merchant:overseas-warehouse:last-mile-order:list；列表权限包含详情只读，客户范围只取认证 Token。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 当前客户海外尾程订单分页 }, '403': { description: 缺少海外尾程订单查看权限 } }
+  /api/merchant/v1/last-leg/orders/{id}:
+    get:
+      summary: 客户查询自己的海外尾程订单详情
+      description: 权限 merchant:overseas-warehouse:last-mile-order:list；不泄露其他客户订单。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: id, in: path, required: true, schema: { type: integer, format: int64 } }]
+      responses: { '200': { description: 当前客户海外尾程订单详情 }, '403': { description: 缺少海外尾程订单查看权限 }, '404': { description: 当前客户下订单不存在 } }
+  /api/merchant/v1/last-leg/warehouse-transfers:
+    get:
+      summary: 客户分页查询自己的仓储转运单
+      description: 权限 merchant:overseas-warehouse:transfer:list；列表权限包含详情只读。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 当前客户仓储转运单分页 }, '403': { description: 缺少仓储转运查看权限 } }
+    post:
+      summary: 客户创建仓储转运单
+      description: 权限 merchant:overseas-warehouse:transfer:create；客户范围只取认证 Token。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 创建后的仓储转运单 }, '403': { description: 缺少仓储转运创建权限 }, '409': { description: 幂等、库存或状态冲突 } }
+  /api/merchant/v1/last-leg/warehouse-transfers/{transferNo}:
+    get:
+      summary: 客户查询自己的仓储转运单详情
+      description: 权限 merchant:overseas-warehouse:transfer:list；不泄露其他客户订单。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: transferNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 当前客户仓储转运单详情 }, '403': { description: 缺少仓储转运查看权限 }, '404': { description: 当前客户下转运单不存在 } }
+  /api/merchant/v1/last-leg/warehouse-transfers/{transferNo}/confirm-measurement:
+    post:
+      summary: 客户确认仓储转运实测数据
+      description: 权限 merchant:overseas-warehouse:transfer:confirm；仅当前客户满足状态门禁的转运单可确认。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: transferNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 确认后的仓储转运单 }, '403': { description: 缺少实测确认权限 }, '409': { description: 状态或版本冲突 } }
+  /api/merchant/v1/last-leg/cargo-discards:
+    get:
+      summary: 客户分页查询自己的货物废弃申请
+      description: 权限 merchant:overseas-warehouse:discard:list；列表权限包含详情和库存候选只读。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 当前客户货物废弃申请分页 }, '403': { description: 缺少货物废弃查看权限 } }
+    post:
+      summary: 客户创建货物废弃申请
+      description: 权限 merchant:overseas-warehouse:discard:create；客户范围只取认证 Token。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 创建后的货物废弃申请 }, '403': { description: 缺少货物废弃创建权限 }, '409': { description: 库存或状态冲突 } }
+  /api/merchant/v1/last-leg/cargo-discards/inventory-candidates:
+    get:
+      summary: 查询当前客户可废弃库存候选
+      description: 权限 merchant:overseas-warehouse:discard:list；候选按认证客户隔离。
+      security: [{ bearerAuth: [] }]
+      responses: { '200': { description: 可废弃库存候选 }, '403': { description: 缺少货物废弃查看权限 } }
+  /api/merchant/v1/last-leg/cargo-discards/{discardNo}:
+    get:
+      summary: 客户查询自己的货物废弃申请详情
+      description: 权限 merchant:overseas-warehouse:discard:list；不泄露其他客户申请。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: discardNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 当前客户货物废弃申请详情 }, '403': { description: 缺少货物废弃查看权限 }, '404': { description: 当前客户下申请不存在 } }
+  /api/merchant/v1/last-leg/cargo-discards/{discardNo}/cancel:
+    post:
+      summary: 客户取消自己的货物废弃申请
+      description: 权限 merchant:overseas-warehouse:discard:cancel；仅满足状态门禁的申请可取消。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: discardNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 取消后的货物废弃申请 }, '403': { description: 缺少货物废弃取消权限 }, '409': { description: 状态冲突 } }
  /api/merchant/v1/last-leg/overseas-procurements:
    post:
      summary: 客户创建海外采购订单
@@ -1310,7 +1379,7 @@ paths:
  /api/merchant/v1/last-leg/relabel-applications/inventory-candidates:
    get:
      summary: 查询客户可换标库存候选
-      description: 权限 merchant:overseas-warehouse:relabel:list；仅返回当前客户在指定海外中转仓仍有可用箱数的历史入仓单和库位摘要。候选按客户 Token 隔离，不接收 customerId；inboundCode 可选精确筛选。
+      description: 权限 merchant:overseas-warehouse:relabel:list；返回当前客户在指定海外中转仓仍有可用箱数的历史入仓库存，以及仓库合箱后生成的可用退货箱库存。候选按客户 Token 隔离，不接收 customerId；inboundCode 可按入仓码、退货单号或仓库唛头模糊筛选。
      security: [{ bearerAuth: [] }]
      parameters:
        - { name: operationWarehouseId, in: query, required: true, schema: { type: string, maxLength: 128 } }
@@ -1374,6 +1443,17 @@ paths:
        '200': { description: 更新后的换标详情, content: { application/json: { schema: { $ref: '#/components/schemas/RelabelMerchantDetailResponse' } } } }
        '400': { description: 文件类型或大小不合法 }
        '409': { description: 当前状态不允许上传 }
+  /api/merchant/v1/last-leg/relabel-applications/{relabelNo}/files:
+    post:
+      summary: 上传客户换标总文件或明细文件
+      description: 权限 merchant:overseas-warehouse:relabel:files；文件只能绑定到当前客户的换标申请。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: relabelNo, in: path, required: true, schema: { type: string, maxLength: 64 } }
+        - { name: scope, in: query, required: true, schema: { type: string, enum: [CARTON_TOTAL, SKU_TOTAL, ITEM] } }
+        - { name: itemId, in: query, required: false, schema: { type: integer, format: int64 } }
+      requestBody: { required: true, content: { multipart/form-data: { schema: { type: object, required: [file], properties: { file: { type: string, format: binary } } } } } }
+      responses: { '200': { description: 更新后的换标详情 }, '403': { description: 缺少换标文件维护权限 }, '409': { description: 状态或归属冲突 } }
  /api/merchant/v1/last-leg/relabel-applications/{relabelNo}/shipping-label/{fileId}/download:
    get:
      summary: 下载换标快递面单
@@ -1432,6 +1512,20 @@ paths:
      security: [{ bearerAuth: [] }]
      parameters: [{ name: returnNo, in: path, required: true, schema: { type: string } }]
      responses: { '200': { description: 当前客户退货订单详情 }, '404': { description: 当前客户下退货订单不存在 } }
+  /api/merchant/v1/last-leg/return-orders/{returnNo}/relabel-candidates:
+    get:
+      summary: 查询退货单可转换标候选
+      description: 权限 merchant:overseas-warehouse:return-order:relabel；只返回当前客户退货单的可转换标明细。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: returnNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 可转换标候选 }, '403': { description: 缺少退货转换标权限 }, '404': { description: 当前客户下退货单不存在 } }
+  /api/merchant/v1/last-leg/return-orders/{returnNo}/relabel:
+    post:
+      summary: 将退货库存转换为换标申请
+      description: 权限 merchant:overseas-warehouse:return-order:relabel；只能处理当前客户且满足状态门禁的退货库存。
+      security: [{ bearerAuth: [] }]
+      parameters: [{ name: returnNo, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: 创建后的换标申请 }, '403': { description: 缺少退货转换标权限 }, '409': { description: 状态、库存或幂等冲突 } }
  /api/pda/v1/last-leg/return-receipts/start:
    post:
      summary: PDA 以退件单号开始签收
@@ -2531,6 +2625,19 @@ components:
        availablePackages: { type: integer, format: int64 }
        version: { type: integer, format: int64 }
        positions: { type: array, items: { $ref: '#/components/schemas/RelabelInventoryPosition' } }
+        sourceType: { type: string, enum: [INBOUND, RETURN_CARTON] }
+        returnCartonId: { type: string, nullable: true, description: 退货合箱库存主键；sourceType=RETURN_CARTON 时提供 }
+        cartonMark: { type: string, nullable: true, description: 仓库合箱后打印并贴箱的仓库唛头 }
+        skuItems:
+          type: array
+          description: 退货箱内 SKU 与件数
+          items:
+            type: object
+            properties:
+              skuCode: { type: string }
+              newSkuCode: { type: string, nullable: true }
+              quantity: { type: integer, minimum: 1 }
+              remark: { type: string, nullable: true }
    RelabelInventoryPosition:
      type: object
      properties:
@@ -2559,10 +2666,10 @@ components:
        remark: { type: string, nullable: true, maxLength: 1000 }
    RelabelCreate:
      type: object
-      required: [customerOrderNo, labelDeadline, contactName, contactPhone, idempotencyKey, items]
+      required: [customerOrderNo, operationWarehouseId, labelDeadline, contactName, contactPhone, idempotencyKey, items]
      properties:
        customerOrderNo: { type: string, maxLength: 128 }
-        overseasWarehouseId: { type: string, nullable: true, maxLength: 128, description: 统一目的海外仓；明细未填写目的仓时使用 }
+        operationWarehouseId: { type: string, maxLength: 128, description: 当前库存所在海外操作仓 }
        labelDeadline: { type: string, format: date-time }
        contactName: { type: string, maxLength: 128 }
        contactPhone: { type: string, maxLength: 64 }
@@ -2576,6 +2683,10 @@ components:
      type: object
      required: [productNameZh, totalPackageCount, notifiedPackageCount, shipmentNo, newSkuCode, cartonMark, fbaCartonMark]
      properties:
+        sourceInventoryBalanceId: { type: string, nullable: true, description: 普通入仓库存来源；与 returnCartonId 二选一 }
+        sourceInventoryPositionId: { type: string, nullable: true, description: 普通入仓库存仓位；与 returnCartonId 二选一 }
+        sourceInboundOrderId: { type: string, nullable: true, description: 普通入仓单；与 returnCartonId 二选一 }
+        returnCartonId: { type: string, nullable: true, description: 仓库合箱产生的退货箱库存；与普通入仓库存字段二选一 }
        skuCode: { type: string, nullable: true, maxLength: 128, description: 商品 SKU（选填） }
        productImageFileId: { type: string, nullable: true, maxLength: 128 }
        productImageFileName: { type: string, nullable: true, maxLength: 255 }