优化提交

2026-09-14 09:58:30 +08:00
parent 5ffd6c0118
commit 8cf7c4b9c9
93 changed files with 2945 additions and 188 deletions
@@ -50,6 +50,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;

@Service
 public class LastlegOrderService {
@@ -76,10 +77,16 @@ public class LastlegOrderService {
    @Resource private WarehouseResourceGateway warehouseResourceGateway;

    public PageResult<LastlegOrderSummary> page(String customerId, LastlegOrderRequests.Query query) {
+        return page(customerId, query, null);
+    }
+
+    public PageResult<LastlegOrderSummary> page(String customerId, LastlegOrderRequests.Query query, String relabelNo) {
        Page<LastlegOrder> page = orderMapper.selectPage(
-            new Page<>(query.page(), query.size()), filter(customerId, query).orderByDesc(LastlegOrder::getCreatedAt));
+            new Page<>(query.page(), query.size()), filter(customerId, query, relabelNo).orderByDesc(LastlegOrder::getCreatedAt));
        Map<Long, List<LastlegOrderMapper.PalletMergeRelationRow>> mergeRelations = palletMergeRelations(page.getRecords());
-        return new PageResult<>(page.getRecords().stream().map(order -> summary(order, mergeRelations.get(order.getId()))).toList(),
+        Map<Long, String> dispatchStatuses = dispatchStatuses(page.getRecords());
+        return new PageResult<>(page.getRecords().stream().map(order -> summary(order, mergeRelations.get(order.getId()),
+                dispatchStatuses.getOrDefault(order.getId(), "UNSCHEDULED"))).toList(),
            page.getCurrent(), page.getSize(), page.getTotal(), page.getPages());
    }

@@ -261,7 +268,8 @@ public class LastlegOrderService {
            .map(value -> new LastlegOrderCommandDtos.ManualNodeView(
                value.getNodeCode(), value.getNodeAt(), value.getSource()))
            .sorted(java.util.Comparator.comparingInt(value -> MANUAL_NODE_CODES.indexOf(value.nodeCode()))).toList();
-        return new LastlegOrderDetailResponse(summary(order, palletMergeRelations(List.of(order)).get(order.getId())), manualNodes, cargo, history.stream()
+        return new LastlegOrderDetailResponse(summary(order, palletMergeRelations(List.of(order)).get(order.getId()),
+            dispatchStatuses(List.of(order)).getOrDefault(order.getId(), "UNSCHEDULED")), manualNodes, cargo, history.stream()
            .map(value -> new LastlegOrderDetailResponse.History(value.getId(), value.getFromStatus(),
                value.getToStatus(), value.getRemark(), value.getCreatedAt())).toList(), fees, operations.stream()
            .map(value -> new LastlegOrderDetailResponse.Operation(value.getId(), value.getOperationNode(),
@@ -508,6 +516,10 @@ public class LastlegOrderService {
    }

    private LambdaQueryWrapper<LastlegOrder> filter(String customerId, LastlegOrderRequests.Query query) {
+        return filter(customerId, query, null);
+    }
+
+    private LambdaQueryWrapper<LastlegOrder> filter(String customerId, LastlegOrderRequests.Query query, String relabelNo) {
        if (query.createdFrom() != null && query.createdTo() != null && query.createdFrom().isAfter(query.createdTo())) {
            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "createdFrom must not be after createdTo");
        }
@@ -516,6 +528,7 @@ public class LastlegOrderService {
        return new LambdaQueryWrapper<LastlegOrder>()
            .eq(StringUtils.hasText(customerId), LastlegOrder::getCustomerId, customerId)
            .like(StringUtils.hasText(query.orderNo()), LastlegOrder::getOrderNo, query.orderNo())
+            .like(StringUtils.hasText(relabelNo), LastlegOrder::getRelabelOrderNo, relabelNo)
            .eq(StringUtils.hasText(query.orderType()), LastlegOrder::getOrderType, query.orderType())
            .like(StringUtils.hasText(query.inboundCode()), LastlegOrder::getInboundCode, query.inboundCode())
            .like(StringUtils.hasText(query.lxCode()), LastlegOrder::getLxCode, query.lxCode())
@@ -558,18 +571,28 @@ public class LastlegOrderService {
        return result;
    }

-    private LastlegOrderSummary summary(LastlegOrder o, List<LastlegOrderMapper.PalletMergeRelationRow> relations) {
+    private Map<Long, String> dispatchStatuses(List<LastlegOrder> orders) {
+        if (orders.isEmpty()) return Map.of();
+        List<LastlegOrderMapper.DispatchStatusRow> rows = orderMapper.findDispatchStatuses(
+            orders.stream().map(LastlegOrder::getId).toList());
+        if (rows == null) return Map.of();
+        return rows.stream().collect(Collectors.toMap(LastlegOrderMapper.DispatchStatusRow::orderId,
+            LastlegOrderMapper.DispatchStatusRow::dispatchStatus));
+    }
+
+    private LastlegOrderSummary summary(LastlegOrder o, List<LastlegOrderMapper.PalletMergeRelationRow> relations,
+                                         String dispatchStatus) {
        List<LastlegOrderMapper.PalletMergeRelationRow> related = relations == null ? List.of() : relations;
        return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(),
            LastlegOrderType.labelOf(o.getOrderType()), o.getDestinationType(), o.getSourceInboundId(),
            displayInboundCode(o), o.getLxCode(), o.getSourceOrderNo(), o.getCustomerId(), o.getCustomerName(), o.getOverseasWarehouseId(),
            o.getOverseasWarehouseCode(), o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
-            o.getTransferWarehouseName(), o.getFbaWarehouseCode(), o.getContainerNo(), o.getContainerStatus(),
+            o.getTransferWarehouseName(), o.getFbaWarehouseCode(), o.getContainerNo(),
            o.getAbnormal(), o.getDetained(), o.getHoldChargeable(), o.getHoldReason(),
            Boolean.TRUE.equals(o.getManualNodeOverride()), Boolean.TRUE.equals(o.getManualNodeOverride()) ? "MANUAL" : "CONTAINER",
            o.getVersion() == null ? 0 : o.getVersion(), o.getPalletCount(), o.getPackageCount(), o.getVolumeCbm(),
            o.getProductQuantity(), o.getVolumeWeightKg(), o.getEstimatedArrivalAt(), o.getActualArrivalAt(),
-            o.getEstimatedWarehouseAt(), o.getInboundOrderNo(), o.getRelabelOrderNo(), o.getRelabelStatus(),
+            o.getEstimatedWarehouseAt(), o.getInboundOrderNo(), dispatchStatus, o.getRelabelOrderNo(), o.getRelabelStatus(),
            o.getPalletMergeFlag(), related.stream().map(LastlegOrderMapper.PalletMergeRelationRow::mergeGroupNo).distinct().findFirst().orElse(null),
            related.stream().map(LastlegOrderMapper.PalletMergeRelationRow::relatedInboundNo).filter(Objects::nonNull).distinct().toList(),
            o.getCurrentStatus(), o.getSubOrderStatus(), o.getPrivateRemark(),