优化

order/src/main/resources/db/order.sql

@@ -20,6 +20,7 @@ CREATE TABLE IF NOT EXISTS ord_order (
   destination_warehouse_name VARCHAR(128) NOT NULL COMMENT '目的仓名称快照',
   expected_ship_date DATE NULL COMMENT '预计发运日期',
   expected_arrival_at DATETIME(3) NULL COMMENT '客户申报预计到货时间',
+  estimated_volume_cbm DECIMAL(18,4) NULL COMMENT '平台运营预估体积（立方米），独立于客户下单及实测体积',
   customer_remark VARCHAR(1000) NULL COMMENT '客户可见备注',
   pickup_method VARCHAR(24) NULL COMMENT '取货方式',
   requested_pickup_at DATETIME(3) NULL COMMENT '客户要求平台上门提货的预约时间',

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

@@ -231,6 +231,21 @@ paths:
       responses:
         '200': {description: 成功返回新版本、渠道历史标记和字段级前后值；版本冲突、渠道与不可逆履约或已确认费用不兼容时响应体业务码为 A0409}
         '403': {description: 无权限或非平台身份}
+  /api/platform/v1/orders/{orderId}/planning:
+    put:
+      summary: 版本化修改订单运营预估
+      description: 需要 platform:order:declaration:edit；只修改预计到货时间与平台预估体积，客户下单和仓库实测体积不受影响。
+      parameters:
+        - $ref: '#/components/parameters/UnifiedOrderId'
+        - $ref: '#/components/parameters/UnifiedTenantId'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/OrderPlanningUpdateRequest'}
+      responses:
+        '200': {description: 成功返回新订单版本；版本冲突时响应体业务码为 A0409}
+        '403': {description: 无权限或非平台身份}
   /api/merchant/v1/orders:
     get:
       summary: 客户统一订单列表
@@ -585,9 +600,17 @@ components:
         expectedVersion: {type: integer, minimum: 0}
         customerRemark: {type: string, nullable: true, maxLength: 1000}
         expectedArrivalAt: {type: string, format: date-time, nullable: true}
+        estimatedVolumeCbm: {type: number, minimum: 0.0001, nullable: true, description: 平台运营预估体积，独立于客户下单货物体积与仓库实测体积}
         channelCode: {type: string, maxLength: 64, description: 与 channelName 同时传；变更时重新校验价格渠道，入仓码保持不变}
         channelName: {type: string, maxLength: 128}
         cargoes: {type: array, minItems: 1, maxItems: 500, items: {$ref: '#/components/schemas/OrderDeclarationCargo'}}
+    OrderPlanningUpdateRequest:
+      type: object
+      required: [expectedVersion]
+      properties:
+        expectedVersion: {type: integer, minimum: 0}
+        expectedArrivalAt: {type: string, format: date-time, nullable: true}
+        estimatedVolumeCbm: {type: number, minimum: 0.0001, nullable: true}
     OrderDeclarationCargo:
       type: object
       required: [itemNo, cargoName, packageCount, totalQuantity, lengthCm, widthCm, heightCm, grossWeightKg, volumeCbm]
@@ -668,6 +691,7 @@ components:
       type: object
       properties:
         orderId: {type: integer, format: int64}
+        orderVersion: {type: integer, nullable: true, description: 列表行编辑使用的订单乐观锁版本，不作为业务编号展示}
         tenantId: {type: integer, format: int64}
         orderNo: {type: string}
         mainStatus: {$ref: '#/components/schemas/UnifiedMainStatus'}
@@ -690,7 +714,8 @@ components:
         totalPackageCount: {type: integer, nullable: true, description: 无入仓事实时为当前订单有效货物箱数合计；存在入仓业务单元后为该单元履约总箱数，拆分后不以父单原始箱数覆盖}
         recommendedPalletType: {type: string, nullable: true, description: 当前无列表级权威事实时返回 null，不得返回固定托盘类型}
         locationCodes: {type: string, nullable: true}
-        expectedVolumeCbm: {type: number, nullable: true, description: Order 客户申报货物体积合计，不得与实测体积混用}
+        estimatedVolumeCbm: {type: number, nullable: true, description: 平台运营填写的预估体积，不得与客户下单或实测体积混用}
+        expectedVolumeCbm: {type: number, nullable: true, description: Order 客户下单货物体积合计，不得与平台预估或实测体积混用}
         actualGrossWeightKg: {type: number, nullable: true, description: 仅 Firstleg 实测毛重；无实测时返回 null}
         actualVolumeCbm: {type: number, nullable: true, description: 仅 Firstleg 实测体积；无实测时返回 null}
         expectedArrivalAt: {type: string, format: date-time, nullable: true}