优化

lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java

@@ -11,12 +11,14 @@ import com.baiyue.lastleg.dto.LastlegOrderRequests;
 import com.baiyue.lastleg.dto.LastlegOrderSummary;
 import com.baiyue.lastleg.dto.ContainerPlanProgressDetail;
 import com.baiyue.lastleg.dto.ContainerPlanProgressSummary;
+import com.baiyue.lastleg.dto.ContainerArrivalTimeView;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.entity.LastlegOrderDetail;
 import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
 import com.baiyue.lastleg.entity.LastlegOrderOperationLog;
 import com.baiyue.lastleg.entity.LastlegOrderManualNode;
 import com.baiyue.lastleg.entity.ReceivingWarehouseOperation;
+import com.baiyue.lastleg.entity.ContainerArrivalTimeOperation;
 import com.baiyue.lastleg.inboundplan.pda.gateway.WarehouseResourceGateway;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanCarton;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanCartonMapper;
@@ -30,6 +32,7 @@ import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.baiyue.lastleg.mapper.LastlegOrderOperationLogMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderManualNodeMapper;
 import com.baiyue.lastleg.mapper.ReceivingWarehouseOperationMapper;
+import com.baiyue.lastleg.mapper.ContainerArrivalTimeOperationMapper;
 import com.baiyue.lastleg.model.LastlegOrderType;
 import com.baiyue.lastleg.shipping.entity.ContainerShippingGate;
 import com.baiyue.lastleg.shipping.mapper.ContainerShippingGateMapper;
@@ -49,6 +52,7 @@ import java.time.ZoneOffset;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -77,6 +81,7 @@ public class LastlegOrderService {
     @Resource private InventoryCommandService inventory;
     @Resource private InboundOrderDetainedOutboxService detainedOutbox;
     @Resource private ReceivingWarehouseOperationMapper receivingWarehouseOperations;
+    @Resource private ContainerArrivalTimeOperationMapper containerArrivalTimeOperations;
     @Resource private WarehouseResourceGateway warehouseResourceGateway;
     @Resource private ContainerShippingGateMapper containerShippingGates;
 
@@ -126,6 +131,76 @@ public class LastlegOrderService {
             orderMapper.findContainerProgressItems(bookingId));
     }
 
+    @Transactional(readOnly = true)
+    public List<ContainerArrivalTimeView> containerArrivalTimes(
+        LastlegOrderRequests.ContainerArrivalTimeQuery request) {
+        LinkedHashSet<String> bookingIds = new LinkedHashSet<>();
+        for (String value : request.sourceContainerBookingIds()) bookingIds.add(normalizeBookingId(value));
+        if (bookingIds.size() != request.sourceContainerBookingIds().size()) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订ID不能重复");
+        }
+        return orderMapper.findContainerArrivalTimes(List.copyOf(bookingIds));
+    }
+
+    @Transactional
+    public ContainerArrivalTimeView changeExpectedWarehouseArrival(String sourceContainerBookingId,
+        String idempotencyKey, LastlegOrderRequests.ChangeExpectedWarehouseArrival request,
+        String operatorName) {
+        String bookingId = normalizeBookingId(sourceContainerBookingId);
+        String key = normalizeIdempotencyKey(idempotencyKey);
+        String requestHash = hash(bookingId + "\n" + request.estimatedWarehouseArrivalAt() + "\n"
+            + request.expectedVersion() + "\n" + Objects.toString(request.remark(), ""));
+        ContainerArrivalTimeOperation replay = containerArrivalTimeOperations.findByKey(key);
+        if (replay != null) {
+            if (!bookingId.equals(replay.getSourceContainerBookingId())
+                || !requestHash.equals(replay.getRequestHash())) {
+                throw new ResponseStatusException(HttpStatus.CONFLICT,
+                    "Idempotency-Key 已用于其他预计到仓时间修改请求");
+            }
+            return requireContainerArrivalTime(bookingId);
+        }
+
+        List<LastlegOrder> orders = orderMapper.lockContainerOrders(bookingId);
+        if (orders.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜不存在");
+        int version = requireSingleArrivalTimeVersion(orders);
+        if (version != request.expectedVersion()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "预计到仓时间版本已变化，请刷新后重试");
+        }
+        if (orderMapper.countContainerPlans(bookingId) > 0) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "该柜已生成入库计划，预计到仓时间不可修改");
+        }
+        int updated = orderMapper.updateContainerExpectedWarehouseArrival(bookingId,
+            request.estimatedWarehouseArrivalAt(), version);
+        if (updated != orders.size()) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内预计到仓时间发生并发变化");
+        }
+        ContainerArrivalTimeOperation operation = new ContainerArrivalTimeOperation();
+        operation.setId(IdWorker.getId()); operation.setSourceContainerBookingId(bookingId);
+        operation.setIdempotencyKey(key); operation.setRequestHash(requestHash);
+        operation.setResultVersion(version + 1); operation.setOperatorName(operatorName);
+        operation.setRemark(request.remark() == null ? null : request.remark().trim());
+        operation.setCreatedAt(LocalDateTime.now()); containerArrivalTimeOperations.insert(operation);
+        return requireContainerArrivalTime(bookingId);
+    }
+
+    private ContainerArrivalTimeView requireContainerArrivalTime(String bookingId) {
+        List<ContainerArrivalTimeView> values = orderMapper.findContainerArrivalTimes(List.of(bookingId));
+        if (values.size() != 1) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜不存在");
+        if (values.get(0).version() < 0) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内预计到仓时间版本不一致");
+        }
+        return values.get(0);
+    }
+
+    private int requireSingleArrivalTimeVersion(List<LastlegOrder> orders) {
+        Set<Integer> versions = orders.stream().map(LastlegOrder::getArrivalTimeVersion)
+            .map(value -> value == null ? 0 : value).collect(Collectors.toSet());
+        if (versions.size() != 1) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内预计到仓时间版本不一致");
+        }
+        return versions.iterator().next();
+    }
+
     @Transactional
     public ContainerPlanProgressSummary changeReceivingWarehouse(String sourceContainerBookingId,
         String idempotencyKey, LastlegOrderRequests.ChangeReceivingWarehouse request, String operatorName) {