优化

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

@@ -30,6 +30,7 @@ CREATE TABLE IF NOT EXISTS ord_order (
   carrier_id BIGINT UNSIGNED NULL COMMENT '船司逻辑ID快照',
   carrier_name VARCHAR(128) NULL COMMENT '船司名称快照',
   tax_mode VARCHAR(24) NULL COMMENT '买单或退税',
+  pricing_tax_mode VARCHAR(16) NULL COMMENT '报价包税维度：TAX_INCLUDED或TAX_EXCLUDED；独立于tax_mode',
   container_mode VARCHAR(24) NULL COMMENT '整柜或散货',
   customs_inspection TINYINT(1) NULL COMMENT '是否商检',
   destination_type VARCHAR(24) NULL COMMENT 'FBA/OVERSEAS/PRIVATE',

order/src/main/resources/db/phase1-order-extension.sql

@@ -33,6 +33,7 @@ CALL phase1_add_column('ord_order', 'receiving_time', "VARCHAR(128) NULL COMMENT
 CALL phase1_add_column('ord_order', 'channel_code', "VARCHAR(64) NULL COMMENT 'Shipping channel code'");
 CALL phase1_add_column('ord_order', 'channel_name', "VARCHAR(128) NULL COMMENT 'Shipping channel snapshot'");
 CALL phase1_add_column('ord_order', 'tax_mode', "VARCHAR(24) NULL COMMENT 'BUY_DECLARATION or TAX_REFUND'");
+CALL phase1_add_column('ord_order', 'pricing_tax_mode', "VARCHAR(16) NULL COMMENT 'TAX_INCLUDED or TAX_EXCLUDED; independent from tax_mode'");
 CALL phase1_add_column('ord_order', 'container_mode', "VARCHAR(24) NULL COMMENT 'FULL_CONTAINER or LCL'");
 CALL phase1_add_column('ord_order', 'customs_inspection', "TINYINT(1) NULL COMMENT 'Whether customs inspection is required'");
 CALL phase1_add_column('ord_order', 'destination_type', "VARCHAR(24) NULL COMMENT 'FBA, OVERSEAS or PRIVATE'");

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

@@ -16,6 +16,7 @@ paths:
         才是 C04 loading/complete 的 expectedVersion，loadingVersion 当前等于 pickingVersion（兼容别名）。
         tenantId 省略时跨全部客户；mainStatus 省略时按订单创建时间分页，指定 PENDING_REVIEW 时由 Order 查询，
         指定其他主状态时由 Firstleg 精确分页。旧 /orders/first-leg 接口保持兼容。
+        列表行同时返回 customerRemark（客户下单备注）和 latestInternalNote（最新一条平台内部备注）。
       parameters:
         - {name: tenantId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
         - $ref: '#/components/parameters/UnifiedKeyword'
@@ -112,7 +113,11 @@ paths:
       parameters:
         - $ref: '#/components/parameters/UnifiedOrderId'
       responses:
-        '200': {description: 成功或业务失败，按响应体 code 判断}
+        '200':
+          description: 成功或业务失败，按响应体 code 判断
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/FirstLegOrderSummary'}
         '403': {description: 需要 merchant:order:view 权限}
   /api/merchant/v1/orders/first-leg:
     get:
@@ -138,7 +143,10 @@ paths:
           description: 成功或业务失败，响应体 code 为字符串 200 时成功
           content:
             application/json:
-              schema: {type: object}
+              schema:
+                type: object
+                properties:
+                  items: {type: array, items: {$ref: '#/components/schemas/FirstLegOrderSummary'}}
     post:
       summary: 创建订单草稿
       parameters:
@@ -147,7 +155,7 @@ paths:
         required: true
         content:
           application/json:
-            schema: {type: object}
+            schema: {$ref: '#/components/schemas/FirstLegOrderDraft'}
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
   /api/merchant/v1/orders/first-leg/{id}/submit:
@@ -180,7 +188,7 @@ paths:
         required: true
         content:
           application/json:
-            schema: {type: object}
+            schema: {$ref: '#/components/schemas/FirstLegOrderDraft'}
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
         '403': {description: 需要 platform:order:create 权限}
@@ -216,35 +224,35 @@ paths:
         required: true
         content:
           application/json:
-            schema: {type: object}
+            schema: {$ref: '#/components/schemas/FirstLegOrderDraft'}
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
         '403': {description: 需要 platform:order:edit 权限}
-  /api/platform/v1/orders/first-leg/{id}/carrier:
-    put:
-      summary: 为待审核订单指派承运商
-      description: 可选的独立指派动作；服务端从公共往来单位主数据校验 CARRIER 类型并写入可信名称快照，不作为审核通过的前置条件。
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - $ref: '#/components/parameters/TenantId'
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [carrierId]
-              properties:
-                carrierId: {type: string, pattern: '^[1-9][0-9]*$'}
-      responses:
-        '200': {description: 指派成功或业务失败，按响应体 code 判断}
-        '403': {description: 需要 platform:order:approve 权限}
 components:
   securitySchemes:
     bearerAuth:
       type: http
       scheme: bearer
       bearerFormat: JWT
+  schemas:
+    PricingTaxMode:
+      type: string
+      enum: [TAX_INCLUDED, TAX_EXCLUDED]
+      description: 报价包税维度；独立于订单 taxMode 的买单/退税语义
+    FirstLegOrderDraft:
+      type: object
+      required: [pricingTaxMode]
+      properties:
+        pricingTaxMode: {$ref: '#/components/schemas/PricingTaxMode'}
+      description: >-
+        订单保存请求中的完整字段以服务端 FirstLegOrderSaveRequest 为准；pricingTaxMode
+        是新建和编辑订单的必填报价维度；历史存量订单的响应字段仍允许为空。
+    FirstLegOrderSummary:
+      type: object
+      properties:
+        orderId: {type: string, pattern: '^[1-9][0-9]*$'}
+        orderNo: {type: string}
+        pricingTaxMode: {$ref: '#/components/schemas/PricingTaxMode'}
   parameters:
     UnifiedKeyword:
       name: keyword