fix: support multi-customer overseas receiving containers

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/entity/ContainerShippingGate.java

@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
 public class ContainerShippingGate {
     @TableId(type = IdType.INPUT)
     private String containerBookingId;
-    private String customerId;
     private String oceanBookingId;
     private String containerNo;
     private String status;

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/mapper/ContainerShippingGateMapper.java

@@ -12,18 +12,17 @@ public interface ContainerShippingGateMapper extends BaseMapper<ContainerShippin
     @Select("SELECT * FROM ll_container_shipping_gate WHERE container_booking_id=#{containerBookingId} FOR UPDATE")
     ContainerShippingGate lock(@Param("containerBookingId") String containerBookingId);
 
-    @Insert("INSERT IGNORE INTO ll_container_shipping_gate(container_booking_id,customer_id,ocean_booking_id," +
+    @Insert("INSERT IGNORE INTO ll_container_shipping_gate(container_booking_id,ocean_booking_id," +
         "container_no,status,node_sequence,aggregate_version,handover_version,created_at,updated_at) VALUES(" +
-        "#{containerBookingId},#{customerId},#{oceanBookingId},#{containerNo},'AWAITING_PICKUP_READY',0," +
+        "#{containerBookingId},#{oceanBookingId},#{containerNo},'AWAITING_PICKUP_READY',0," +
         "#{aggregateVersion},#{handoverVersion},NOW(3),NOW(3))")
-    int initialize(@Param("containerBookingId") String containerBookingId, @Param("customerId") String customerId,
+    int initialize(@Param("containerBookingId") String containerBookingId,
                    @Param("oceanBookingId") String oceanBookingId, @Param("containerNo") String containerNo,
                    @Param("aggregateVersion") long aggregateVersion, @Param("handoverVersion") long handoverVersion);
 
-    @Select("SELECT CASE WHEN COUNT(DISTINCT o.source_container_booking_id)=1 " +
-        "AND MIN(CASE WHEN g.status='RECEIVING_AVAILABLE' THEN 1 ELSE 0 END)=1 THEN 1 ELSE 0 END " +
-        "FROM ll_order o LEFT JOIN ll_container_shipping_gate g " +
-        "ON g.container_booking_id=o.source_container_booking_id AND g.customer_id=o.customer_id " +
-        "WHERE o.customer_id=#{customerId} AND o.container_no=#{containerNo}")
-    int receivingAvailable(@Param("customerId") String customerId, @Param("containerNo") String containerNo);
+    @Select("SELECT CASE WHEN COUNT(*)=1 AND MIN(CASE WHEN status='RECEIVING_AVAILABLE' THEN 1 ELSE 0 END)=1 " +
+        "THEN 1 ELSE 0 END FROM ll_container_shipping_gate " +
+        "WHERE container_booking_id=#{containerBookingId} AND container_no=#{containerNo}")
+    int receivingAvailable(@Param("containerBookingId") String containerBookingId,
+                           @Param("containerNo") String containerNo);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/shipping/service/ContainerShippingNodeConsumer.java

@@ -49,11 +49,10 @@ public class ContainerShippingNodeConsumer {
             return 1;
         }
 
-        gates.initialize(payload.containerBookingId(), payload.customerId(), payload.oceanBookingId(),
+        gates.initialize(payload.containerBookingId(), payload.oceanBookingId(),
             payload.containerNo(), 0, 1);
         ContainerShippingGate gate = gates.lock(payload.containerBookingId());
-        if (gate == null || !payload.customerId().equals(gate.getCustomerId())
-            || !payload.containerNo().equals(gate.getContainerNo())) {
+        if (gate == null || !payload.containerNo().equals(gate.getContainerNo())) {
             throw new IllegalArgumentException("船节点柜号快照与装柜交接不一致");
         }
         apply(gate, envelope, payload);
@@ -108,9 +107,8 @@ public class ContainerShippingNodeConsumer {
     }
 
     private void validateEnvelopePayload(EventEnvelope envelope, FirstLegContainerShippingNodeRecordedV1 payload) {
-        if (!envelope.tenantId().equals(payload.customerId())
-            || !envelope.aggregateId().equals(payload.containerBookingId())) {
-            throw new IllegalArgumentException("船节点交接客户或聚合标识不一致");
+        if (!"0".equals(envelope.tenantId()) || !envelope.aggregateId().equals(payload.containerBookingId())) {
+            throw new IllegalArgumentException("船节点交接平台作用域或聚合标识不一致");
         }
     }