Merge remote-tracking branch 'origin/test' into dev

deploy/docker-compose.overseas.yml

@@ -1,7 +1,7 @@
 name: firstleg-${DEPLOY_ENV:-test}-overseas
 
 x-overseas-common: &overseas-common
-  restart: unless-stopped
+  restart: "on-failure:3"
   networks: [firstleg-overseas-network, infra-network]
   extra_hosts:
     - "host.docker.internal:host-gateway"

deploy/docker-compose.rocketmq.yml

@@ -9,14 +9,14 @@ x-bounded-logging: &bounded-logging
 services:
   rocketmq-namesrv:
     image: apache/rocketmq:5.3.1
-    restart: unless-stopped
+    restart: "on-failure:3"
     command: sh mqnamesrv
     logging: *bounded-logging
     networks: [infra-network]
 
   rocketmq-broker:
     image: apache/rocketmq:5.3.1
-    restart: unless-stopped
+    restart: "on-failure:3"
     depends_on: [rocketmq-namesrv]
     environment:
       ROCKETMQ_BROKER_IP: ${ROCKETMQ_BROKER_IP:?ROCKETMQ_BROKER_IP is required}
@@ -53,7 +53,7 @@ services:
       sh mqadmin updateTopic -n rocketmq-namesrv:9876 -c BaiyueCluster
       -t "%DLQ%$${MQ_TOPIC_PREFIX}baiyue-audit-consumer-v1" -r 1 -w 1 -p 6'
     # Broker 注册较慢或任一初始化命令失败时整组重试；所有命令均幂等。
-    restart: on-failure
+    restart: "on-failure:3"
     logging: *bounded-logging
     networks: [infra-network]
 

deploy/docker-compose.yml

@@ -1,7 +1,7 @@
 name: firstleg-${DEPLOY_ENV:-test}
 
 x-common: &common
-  restart: unless-stopped
+  restart: "on-failure:3"
   networks: [firstleg-network, infra-network]
   # 测试机复用宿主机的 MySQL、Redis、Nacos 时，容器通过此别名访问宿主机。
   extra_hosts:

deploy/sql/README.md

@@ -244,3 +244,7 @@ SELECT
 - 固定入口只补目标字段并做 fail-fast 校验，不回填、改号、清理或从其他表推断开发旧行。`ll_dispatch_pda_task.warehouse_id` 存在 `NULL`、空值或 `0`，或任一待收敛全局业务号/任务号、完成幂等键发生冲突时，脚本立即 `SIGNAL`；应重新造数，重置或清理仍需用户另行授权。
 - 数据门禁通过后，脚本原位把 `dispatch_no`、`outbound_no`、排车 PDA `task_no`、出库 PDA `task_no` 收敛为全局唯一，并建立 `(customer_id, completion_idempotency_key)` 完成命令唯一约束；旧客户复合索引不保留。
 - 必须在启动或重启 Lastleg Service 前完成固定入口；不得单独执行模块基线补丁、日期脚本或手工兼容 SQL。
+
+## 码头车队邮件
+
+国内统一入口包含 `fl_terminal_drayage_mail`，用于冻结收件地址、两类邮件正文、投递状态和失败信息；创建后才可发布相关 Firstleg 功能。发信配置默认关闭，配置说明见 [Firstleg 车队邮件](../../firstleg/docs/terminal-drayage-mail.md)。邮件功能涉及 Admin、Firstleg 和 Warehouse 内部联系资料接口，无新增权限码。

deploy/sql/头程数据库统一增量-MySQL8.sql

@@ -18431,9 +18431,32 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage (
   KEY idx_terminal_drayage_warning(actual_empty_return_at,estimated_empty_return_at),
   CONSTRAINT fk_terminal_drayage_container FOREIGN KEY(container_booking_id) REFERENCES fl_container_booking(id),
   CONSTRAINT chk_terminal_drayage_times CHECK((actual_pickup_at IS NULL OR pickup_appointment_at IS NOT NULL)
-    AND (actual_empty_return_at IS NULL OR actual_pickup_at IS NOT NULL)
-    AND (actual_empty_return_at IS NULL OR actual_empty_return_at >= actual_pickup_at))
+    AND (actual_empty_return_at IS NULL OR actual_pickup_at IS NULL OR actual_empty_return_at >= actual_pickup_at))
 ) ENGINE=InnoDB COMMENT='目的港货柜级码头拖车与还空事实';
+CREATE TABLE IF NOT EXISTS fl_terminal_drayage_mail (
+  id BIGINT UNSIGNED NOT NULL COMMENT '邮件任务ID',
+  container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '归属物理货柜ID',
+  fleet_supplier_id BIGINT UNSIGNED NOT NULL COMMENT '车队供应商ID快照',
+  fleet_name VARCHAR(128) NOT NULL COMMENT '车队名称快照',
+  recipient VARCHAR(254) NOT NULL COMMENT '收件人邮箱',
+  kind VARCHAR(32) NOT NULL COMMENT '邮件类型：REQUEST_PICKUP提柜请求、CANCEL_PICKUP取消提柜',
+  subject VARCHAR(255) NOT NULL COMMENT '邮件主题',
+  body TEXT NOT NULL COMMENT '邮件正文',
+  status VARCHAR(16) NOT NULL DEFAULT 'PENDING' COMMENT '投递状态：PENDING待发送、SENDING发送中、SENT已发送、FAILED失败',
+  attempts INT NOT NULL DEFAULT 0 COMMENT '发送尝试次数',
+  failure_reason VARCHAR(500) NULL COMMENT '发送失败原因',
+  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
+  updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后更新人ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  sent_at DATETIME(3) NULL COMMENT '发送成功时间',
+  PRIMARY KEY(id),
+  KEY idx_terminal_mail_dispatch(status,id),
+  KEY idx_terminal_mail_container(container_booking_id,id,status),
+  CONSTRAINT fk_terminal_mail_container FOREIGN KEY(container_booking_id) REFERENCES fl_container_booking(id),
+  CONSTRAINT chk_terminal_mail_kind CHECK(kind IN ('REQUEST_PICKUP','CANCEL_PICKUP')),
+  CONSTRAINT chk_terminal_mail_status CHECK(status IN ('PENDING','SENDING','SENT','FAILED'))
+) ENGINE=InnoDB COMMENT='码头车队邮件任务与投递记录';
 CREATE TABLE IF NOT EXISTS fl_terminal_drayage_history (
   id BIGINT UNSIGNED NOT NULL COMMENT '历史ID', drayage_id BIGINT UNSIGNED NOT NULL COMMENT '码头拖车聚合ID',
   container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '货柜ID快照', action VARCHAR(32) NOT NULL COMMENT '业务动作',
@@ -18458,6 +18481,10 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage_operation (
 
 -- MySQL DDL 会隐式提交；如果前次执行在末段校验失败，重跑时需把已创建表的列注释收敛到当前基线。
 ALTER TABLE fl_terminal_drayage
+  DROP CHECK chk_terminal_drayage_times,
+  ADD CONSTRAINT chk_terminal_drayage_times CHECK(
+    (actual_pickup_at IS NULL OR pickup_appointment_at IS NOT NULL) AND
+    (actual_empty_return_at IS NULL OR actual_pickup_at IS NULL OR actual_empty_return_at >= actual_pickup_at)),
   MODIFY COLUMN id BIGINT UNSIGNED NOT NULL COMMENT '目的港码头拖车聚合ID',
   MODIFY COLUMN container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '唯一归属物理货柜ID',
   MODIFY COLUMN fleet_supplier_id BIGINT UNSIGNED NULL COMMENT 'Warehouse ACTIVE/TRUCKING供应商ID快照',
@@ -18502,6 +18529,9 @@ DROP PROCEDURE IF EXISTS assert_terminal_drayage_schema;
 DELIMITER $$
 CREATE PROCEDURE assert_terminal_drayage_schema()
 BEGIN
+  IF (SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA='baiyue_firstleg' AND TABLE_NAME='fl_terminal_drayage_mail') <> 1 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一基线校验失败：码头车队邮件任务表缺失';
+  END IF;
   IF (SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA='baiyue_firstleg'
       AND TABLE_NAME IN ('fl_terminal_drayage','fl_terminal_drayage_history','fl_terminal_drayage_operation')) <> 3 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一迁移失败：目的港码头拖车表不完整';