优化

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/DeliveryTransferController.java

@@ -10,12 +10,14 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
+@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/platform/v1/last-leg")
 @Tag(name = "Outbound and delivery")
 public class DeliveryTransferController {

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/dto/DeliveryResponses.java

@@ -1,6 +1,5 @@
 package com.baiyue.lastleg.delivery.dto;
 
-import com.baiyue.common.core.api.PageResult;
 import java.time.LocalDateTime;
 
 public final class DeliveryResponses {
@@ -17,11 +16,5 @@ public final class DeliveryResponses {
                               String overseasWarehouseId, String status, int palletCount,
                               int packageCount, LocalDateTime createdAt) {}
 
-    public record PalletRow(Long id, Long warehousePalletId, String palletNo, String inboundCode,
-                            String orderRefs, String destinationWarehouseId,
-                            String destinationWarehouseCode, String destinationWarehouseName,
-                            int packageCount) {}
-
-    public record OutboundDetail(OutboundRow outbound, DeliveryRow delivery,
-                                 PageResult<PalletRow> pallets) {}
+    public record OutboundDetail(OutboundRow outbound, DeliveryRow delivery) {}
 }

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryTransferService.java

@@ -136,14 +136,7 @@ public class DeliveryTransferService {
         OutboundOrder outbound = outboundOrders.findByNo(customerId, outboundNo);
         if (outbound == null) throw notFound("Outbound order not found");
         DeliveryOrder delivery = requireDelivery(customerId, outbound.getId());
-        Page<OutboundPalletItem> page = outboundPallets.selectPage(new Page<>(query.page(), query.size()),
-            new LambdaQueryWrapper<OutboundPalletItem>().eq(OutboundPalletItem::getCustomerId, customerId)
-                .eq(OutboundPalletItem::getOutboundOrderId, outbound.getId())
-                .eq(StringUtils.hasText(query.destinationWarehouseCode()),
-                    OutboundPalletItem::getDestinationWarehouseCode, query.destinationWarehouseCode())
-                .orderByAsc(OutboundPalletItem::getId));
-        return new DeliveryResponses.OutboundDetail(outboundRow(outbound), deliveryRow(delivery),
-            page(page, page.getRecords().stream().map(this::palletRow).toList()));
+        return new DeliveryResponses.OutboundDetail(outboundRow(outbound), deliveryRow(delivery));
     }
 
     public PageResult<DeliveryResponses.DeliveryRow> deliveryPage(String customerId, DeliveryRequests.Query query) {
@@ -206,7 +199,6 @@ public class DeliveryTransferService {
     }
     private DeliveryResponses.OutboundRow outboundRow(OutboundOrder o) { return new DeliveryResponses.OutboundRow(o.getId(), o.getOutboundNo(), o.getDispatchNo(), o.getOverseasWarehouseId(), o.getStatus(), o.getPalletCount(), o.getPackageCount(), o.getCreatedAt()); }
     private DeliveryResponses.DeliveryRow deliveryRow(DeliveryOrder d) { return new DeliveryResponses.DeliveryRow(d.getId(), d.getDeliveryNo(), d.getOutboundNo(), d.getDispatchNo(), d.getOverseasWarehouseId(), d.getStatus(), d.getPalletCount(), d.getPackageCount(), d.getCreatedAt()); }
-    private DeliveryResponses.PalletRow palletRow(OutboundPalletItem p) { return new DeliveryResponses.PalletRow(p.getId(), p.getWarehousePalletId(), p.getPalletNo(), p.getInboundCode(), p.getOrderRefs(), p.getDestinationWarehouseId(), p.getDestinationWarehouseCode(), p.getDestinationWarehouseName(), p.getPackageCount()); }
     private static <T> PageResult<T> page(Page<?> page, List<T> records) { return new PageResult<>(records, page.getCurrent(), page.getSize(), page.getTotal(), page.getPages()); }
     private static ResponseStatusException conflict(String message) { return new ResponseStatusException(HttpStatus.CONFLICT, message); }
     private static ResponseStatusException notFound(String message) { return new ResponseStatusException(HttpStatus.NOT_FOUND, message); }