提交

2026-11-03 11:41:58 +08:00
parent 21a9ce7d27
commit 7b5ef9ba64
56 changed files with 679 additions and 173 deletions
@@ -2665,13 +2665,13 @@ paths:
      responses: { '200': { description: 当前客户货物废弃申请分页 }, '403': { description: 缺少货物废弃查看权限 } }
    post:
      summary: 客户创建货物废弃申请
-      description: 权限 merchant:overseas-warehouse:discard:create；客户范围只取认证 Token。
+      description: 权限 merchant:overseas-warehouse:discard:create；客户范围只取认证 Token；仅支持普通库存与退货库存，拒绝一件代发订单，申请人 createdByName 从认证账号姓名保存快照。
      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；候选按认证客户隔离。
+      description: 权限 merchant:overseas-warehouse:discard:list；候选按认证客户隔离，过滤一件代发订单与库存仓位。
      security: [{ bearerAuth: [] }]
      responses: { '200': { description: 可废弃库存候选 }, '403': { description: 缺少货物废弃查看权限 } }
  /api/merchant/v1/last-leg/cargo-discards/{discardNo}:
@@ -2837,16 +2837,25 @@ paths:
      security: [{ bearerAuth: [] }]
      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/TruckUpdate' } } } }
      responses: { '200': { description: 统一 ApiResponse 包装的卡车订单详情 } }
+  /api/merchant/v1/last-leg/us-truck-orders/{orderNo}/status:
+    patch:
+      summary: 客户取消待审核本土卡车订单
+      description: 权限 merchant:cross-border:domestic-trucking:edit；客户范围取当前身份，仅 PENDING_REVIEW 可取消，携带版本、幂等键和取消原因，同时释放预算预占。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: orderNo, in: path, required: true, schema: { type: string } }
+      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/TruckCancel' } } } }
+      responses: { '200': { description: 统一 ApiResponse 包装的卡车订单详情 }, '409': { description: 当前订单不可取消或版本已变化 } }
  /api/platform/v1/last-leg/us-truck-orders/{orderNo}/status:
    patch:
-      summary: 取消未发车的本土卡车订单
-      description: 权限 platform:overseas-business:truck:status；该通用入口只接受 CANCELLED，正向状态必须使用具名命令，不能绕过实收、超托与分配事实。
+      summary: 平台取消入口已禁止
+      description: 平台不得取消本土卡车订单，旧入口始终拒绝；由客户待审核阶段自行取消。
      security: [{ bearerAuth: [] }]
      parameters:
        - { name: orderNo, in: path, required: true, schema: { type: string } }
        - { name: customerId, in: query, required: true, schema: { type: string, pattern: '^[1-9][0-9]*$' } }
      requestBody: { required: true, content: { application/json: { schema: { $ref: '#/components/schemas/TruckCancel' } } } }
-      responses: { '200': { description: 统一 ApiResponse 包装的卡车订单详情 }, '409': { description: 非法状态迁移 } }
+      responses: { '403': { description: 平台不能取消本土卡车订单 } }
  /api/platform/v1/last-leg/us-truck-orders/{orderNo}/review:
    parameters: &truckOrderTarget
      - { name: orderNo, in: path, required: true, schema: { type: string } }
@@ -5240,13 +5249,13 @@ components:
        remark: { type: string, nullable: true, maxLength: 1000 }
    TruckCreate:
      type: object
-      required: [vehicleType, origin, destination, totalWeightKg, totalVolumeCbm, originContactName, originContactPhone, destinationContactName, destinationContactPhone, pickupAt, deliveryAt, palletCount, budgetAmount, idempotencyKey]
+      required: [vehicleType, origin, originAddress, destination, destinationAddress, totalWeightKg, totalVolumeCbm, originContactName, originContactPhone, destinationContactName, destinationContactPhone, pickupAt, deliveryAt, palletCount, budgetAmount, idempotencyKey]
      properties:
        vehicleType: { type: string, enum: [PALLET_15, PALLET_30], description: '15拖或30拖；拼车来源未知时为空' }
        origin: { type: string, maxLength: 255 }
-        originAddress: { type: string, nullable: true, maxLength: 500 }
+        originAddress: { type: string, minLength: 1, maxLength: 500 }
        destination: { type: string, maxLength: 255 }
-        destinationAddress: { type: string, nullable: true, maxLength: 500 }
+        destinationAddress: { type: string, minLength: 1, maxLength: 500 }
        palletCount: { type: integer, minimum: 1, description: '下单预估托数' }
        totalWeightKg: { type: number, minimum: 0 }
        totalVolumeCbm: { type: number, minimum: 0 }
@@ -5262,14 +5271,14 @@ components:
        idempotencyKey: { type: string, maxLength: 255 }
    TruckUpdate:
      type: object
-      required: [version, vehicleType, originContactName, originContactPhone, destinationContactName, destinationContactPhone, pickupAt, deliveryAt, palletCount, budgetAmount]
+      required: [version, vehicleType, originAddress, destinationAddress, originContactName, originContactPhone, destinationContactName, destinationContactPhone, pickupAt, deliveryAt, palletCount, budgetAmount]
      properties:
        version: { type: integer, format: int64, minimum: 0 }
        vehicleType: { type: string, enum: [PALLET_15, PALLET_30], description: '15拖或30拖；拼车来源未知时为空' }
        origin: { type: string, maxLength: 255 }
-        originAddress: { type: string, nullable: true, maxLength: 500 }
+        originAddress: { type: string, minLength: 1, maxLength: 500 }
        destination: { type: string, maxLength: 255 }
-        destinationAddress: { type: string, nullable: true, maxLength: 500 }
+        destinationAddress: { type: string, minLength: 1, maxLength: 500 }
        palletCount: { type: integer, minimum: 1, description: '下单预估托数' }
        totalWeightKg: { type: number, minimum: 0 }
        totalVolumeCbm: { type: number, minimum: 0 }