优化

firstleg/src/main/java/com/baiyue/firstleg/terminaldrayage/service/TerminalDrayageMailDispatcher.java

@@ -20,11 +20,10 @@ public class TerminalDrayageMailDispatcher {
     @Value("${baiyue.terminal-drayage.mail.port:587}") private int port;
     @Value("${baiyue.terminal-drayage.mail.username}") private String username;
     @Value("${baiyue.terminal-drayage.mail.password}") private String password;
-    @Value("${baiyue.terminal-drayage.mail.from}") private String from;
     @Value("${baiyue.terminal-drayage.mail.ssl:false}") private boolean ssl;
 
     JavaMailSenderImpl sender() {
-        TerminalDrayageMailService.validateAddress(from);
+        TerminalDrayageMailService.validateAddress(username);
         var sender = new JavaMailSenderImpl();
         sender.setHost(host); sender.setPort(port); sender.setUsername(username); sender.setPassword(password);
         sender.setDefaultEncoding("UTF-8");
@@ -47,7 +46,7 @@ public class TerminalDrayageMailDispatcher {
             if (mapper.claimMail(mail.id()) != 1) continue;
             try {
                 var message = new SimpleMailMessage();
-                message.setFrom(from); message.setTo(mail.recipient());
+                message.setFrom(username); message.setTo(mail.recipient());
                 message.setSubject(mail.subject()); message.setText(mail.body());
                 sender().send(message);
                 if (mapper.completeMail(mail.id()) != 1) log.warn("Terminal drayage mail completion requires review: {}", mail.id());

firstleg/src/main/java/com/baiyue/firstleg/terminaldrayage/service/TerminalDrayageMailService.java

@@ -34,11 +34,12 @@ public class TerminalDrayageMailService {
 
     public void replaceFleet(long containerId, String containerNo, long oldSupplierId, long newSupplierId, long operatorId) {
         var next = contact(newSupplierId, true);
-        // 取消通知发往原请求的收件地址；尚未发过请求则读取原车队资料，允许原车队已停用。
+        // 请求邮件记录就是当前车队是否已下发的事实；未下发过时不能向原车队发送无来源的取消通知。
         MailTask previous = mapper.lastPickupMail(containerId, oldSupplierId);
-        var old = previous == null ? contact(oldSupplierId, false)
-            : new WarehouseSupplierClient.TruckingContact(oldSupplierId, previous.fleetName(), previous.recipient());
-        enqueue(containerId, containerNo, oldSupplierId, old.name(), old.email(), "CANCEL_PICKUP", operatorId);
+        if (previous != null) {
+            enqueue(containerId, containerNo, oldSupplierId, previous.fleetName(), previous.recipient(),
+                "CANCEL_PICKUP", operatorId);
+        }
         enqueue(containerId, containerNo, newSupplierId, next.name(), next.email(), "REQUEST_PICKUP", operatorId);
     }
 

firstleg/src/main/resources/application.yml

@@ -37,7 +37,6 @@ baiyue:
       port: ${TERMINAL_DRAYAGE_MAIL_PORT:587}
       username: ${TERMINAL_DRAYAGE_MAIL_USERNAME:}
       password: ${TERMINAL_DRAYAGE_MAIL_PASSWORD:}
-      from: ${TERMINAL_DRAYAGE_MAIL_FROM:}
       ssl: ${TERMINAL_DRAYAGE_MAIL_SSL:false}
       scan-delay: ${TERMINAL_DRAYAGE_MAIL_SCAN_DELAY:10000}
   carrier-schedule:

firstleg/src/main/resources/openapi/terminal-drayage-v1.yaml

@@ -55,7 +55,7 @@ paths:
   /api/platform/v1/terminal-drayages/{containerBookingId}/pickup-email:
     post:
       summary: 将当前车队提柜邮件加入发送队列
-      description: 初次选择车队不发信；此命令携带版本和幂等键，发送成功是任务已入队，不表示已送达。首次更换车队自动原子入队取消和新提柜两封邮件。同一车队重复选择不发信。
+      description: 初次选择车队不发信；此命令携带版本和幂等键，发送成功是任务已入队，不表示已送达。人工可使用最新版本重复发送提柜请求。更换车队时，原车队存在提柜请求邮件记录才原子入队取消邮件，并始终为新车队入队提柜请求；原车队从未下发时不发送取消邮件。同一车队重复选择不发信。
       x-permission: platform:firstleg:terminal-drayage:fleet:edit
       parameters: [{$ref: '#/components/parameters/ContainerBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {required: true, content: {application/json: {schema: {type: object, required: [expectedVersion], properties: {expectedVersion: {type: integer, minimum: 0}}}}}}