优化

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

@@ -11,7 +11,7 @@ paths:
       summary: 客户订单工作台分页和筛选后待办数量
       description: >-
         仅按登录客户查询，权限merchant:order:list。草稿优先，再按创建时间和订单ID降序稳定分页。
-        入仓码/SKU采用或匹配；所有条件先筛选再计数。四类数量共用当前筛选，不从当前页行数计算。
+        入仓码/SKU采用或匹配；所有条件先筛选再计数。十类数量共用当前筛选，不从当前页行数计算。
         默认包含草稿和有效正式单；履约子状态以Firstleg为准，待审核和已完成以Order为准。
       security: [{bearerAuth: []}]
       parameters:
@@ -23,7 +23,7 @@ paths:
         - {name: mainStatus, in: query, schema: {type: string, enum: [DRAFT, PENDING_REVIEW, WAIT_MEASURE, WAIT_PALLETIZE, WAIT_SPLIT, LOADING, LOADED, DELIVERED, COMPLETED, CANCELLED]}}
         - {name: createdFrom, in: query, schema: {type: string, format: date-time}}
         - {name: createdTo, in: query, schema: {type: string, format: date-time}}
-        - {name: queue, in: query, schema: {type: string, enum: [all, fee, customs, draft], default: all}}
+        - {name: queue, in: query, schema: {type: string, enum: [all, fee, customs, draft, loaded, declared, cleared, scheduled, delivering, delivered], default: all}}
         - {name: page, in: query, schema: {type: integer, minimum: 1, default: 1}}
         - {name: size, in: query, schema: {type: integer, minimum: 1, maximum: 200, default: 10}}
       responses:
@@ -37,18 +37,35 @@ paths:
                   code: {type: string}
                   data:
                     type: object
-                    required: [page, queues, channelNames]
+                    required: [page, queues, channelNames, progress]
                     properties:
                       page: {$ref: '#/components/schemas/UnifiedOrderPage'}
                       queues:
                         type: object
-                        required: [all, fee, customs, draft]
+                        required: [all, fee, customs, draft, loaded, declared, cleared, scheduled, delivering, delivered]
                         properties:
                           all: {type: integer, format: int64, minimum: 0}
                           fee: {type: integer, format: int64, minimum: 0}
                           customs: {type: integer, format: int64, minimum: 0}
                           draft: {type: integer, format: int64, minimum: 0}
+                          loaded: {type: integer, format: int64, minimum: 0}
+                          declared: {type: integer, format: int64, minimum: 0}
+                          cleared: {type: integer, format: int64, minimum: 0}
+                          scheduled: {type: integer, format: int64, minimum: 0}
+                          delivering: {type: integer, format: int64, minimum: 0}
+                          delivered: {type: integer, format: int64, minimum: 0}
                       channelNames: {type: array, items: {type: string}, description: 当前客户完整渠道筛选项，不限于当前页}
+                      progress:
+                        type: array
+                        description: 与当前页订单一一对应的客户履约进度；分类互斥，待办可重叠。分片未齐时partial为true，完成只认Order可信回写。
+                        items:
+                          type: object
+                          required: [orderId, stage, partial]
+                          properties:
+                            orderId: {type: string, pattern: '^[1-9][0-9]*$'}
+                            stage: {type: string, enum: [none, loaded, declared, cleared, scheduled, delivering, delivered]}
+                            partial: {type: boolean}
+
   /internal/order/v1/fulfillment-completions:
     post:
       security: []