修改提交

2026-08-21 17:21:26 +08:00
parent af97217184
commit bbd303cd65
36 changed files with 1045 additions and 100 deletions
@@ -0,0 +1,47 @@
+package com.baiyue.lastleg.transfer.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.transfer.dto.WarehouseTransferRequests;
+import com.baiyue.lastleg.transfer.dto.WarehouseTransferResponses;
+import com.baiyue.lastleg.transfer.service.WarehouseTransferService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+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
+@RequestMapping("/api/merchant/v1/last-leg/warehouse-transfers")
+public class MerchantWarehouseTransferController {
+    @Resource private WarehouseTransferService service;
+
+    @PostMapping
+    public ApiResponse<WarehouseTransferResponses.Detail> create(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody WarehouseTransferRequests.Create request) {
+        return ApiResponse.success(service.create(customer(user), operator(user), request));
+    }
+
+    @GetMapping
+    public ApiResponse<PageResult<WarehouseTransferResponses.Summary>> page(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid WarehouseTransferRequests.Query query) {
+        return ApiResponse.success(service.page(customer(user), query));
+    }
+
+    @GetMapping("/{transferNo}")
+    public ApiResponse<WarehouseTransferResponses.Detail> detail(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String transferNo) {
+        return ApiResponse.success(service.detail(customer(user), transferNo));
+    }
+
+    private String customer(AuthenticatedUser user) {
+        if (user == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        if ("PLATFORM".equals(user.appCode()) || user.tenantId() == 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Merchant identity is required");
+        }
+        return String.valueOf(user.tenantId());
+    }
+    private String operator(AuthenticatedUser user) { return user.userId() == null ? user.username() : String.valueOf(user.userId()); }
+}
@@ -1,6 +1,7 @@
 package com.baiyue.lastleg.transfer.controller;

 import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.transfer.dto.WarehouseTransferRequests;
 import com.baiyue.lastleg.transfer.dto.WarehouseTransferResponses;
@@ -24,6 +25,12 @@ public class WarehouseTransferController {
        return ApiResponse.success(service.create(scope(user, customerId), operator(user), request));
    }

+    @GetMapping
+    public ApiResponse<PageResult<WarehouseTransferResponses.Summary>> page(@AuthenticationPrincipal AuthenticatedUser user,
+        @RequestParam(required = false) String customerId, @Valid WarehouseTransferRequests.Query query) {
+        return ApiResponse.success(service.page(scope(user, customerId), query));
+    }
+
    @GetMapping("/{transferNo}")
    public ApiResponse<WarehouseTransferResponses.Detail> detail(@AuthenticationPrincipal AuthenticatedUser user,
        @RequestParam(required = false) String customerId, @PathVariable String transferNo) {
@@ -1,6 +1,8 @@
 package com.baiyue.lastleg.transfer.dto;

 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -73,4 +75,11 @@ public final class WarehouseTransferRequests {
        @Positive int packageCount,
        @Size(max = 255) String shippingMark
    ) {}
+
+    public record Query(@Min(1) long page, @Min(1) @Max(200) long size,
+                        String transferNo, String inboundCode, String operatingWarehouseId,
+                        String fbaWarehouseCode, String status, Boolean needRelabel,
+                        LocalDateTime createdFrom, LocalDateTime createdTo) {
+        public Query { if (page == 0) page = 1; if (size == 0) size = 20; }
+    }
 }
@@ -10,6 +10,10 @@ public final class WarehouseTransferResponses {
    public record Allocation(Long inventoryPositionId, Long inboundOrderId, String inboundCode,
                             Long palletId, String palletNo, int packageCount, String status,
                             Long destinationInventoryPositionId) {}
+    public record Summary(Long id, String transferNo, String inboundCode, Long lastlegOrderId,
+                          String lastlegOrderNo, String operatingWarehouseId, String fbaWarehouseCode,
+                          int packageCount, String deliveryMethod, boolean needRelabel, String relabelNo,
+                          String status, LocalDateTime estimatedArrivalAt, LocalDateTime createdAt) {}
    public record Detail(Long id, String transferNo, Long inboundOrderId, String inboundCode,
                         Long lastlegOrderId, String lastlegOrderNo, String orderType, String orderStatus,
                         boolean needRelabel, Long relabelApplicationId, String relabelNo, String relabelStatus,
@@ -1,6 +1,8 @@
 package com.baiyue.lastleg.transfer.service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baiyue.common.core.api.PageResult;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.entity.LastlegOrderDetail;
@@ -158,6 +160,32 @@ public class WarehouseTransferService {
        return detail(customerId, transferNo);
    }

+    @Transactional(readOnly = true)
+    public PageResult<WarehouseTransferResponses.Summary> page(String customerId, WarehouseTransferRequests.Query query) {
+        if (query.createdFrom() != null && query.createdTo() != null && query.createdFrom().isAfter(query.createdTo())) {
+            throw badRequest("createdFrom must not be after createdTo");
+        }
+        LambdaQueryWrapper<WarehouseTransferOrder> wrapper = new LambdaQueryWrapper<WarehouseTransferOrder>()
+            .eq(StringUtils.hasText(customerId), WarehouseTransferOrder::getCustomerId, customerId)
+            .like(StringUtils.hasText(query.transferNo()), WarehouseTransferOrder::getTransferNo, query.transferNo())
+            .like(StringUtils.hasText(query.inboundCode()), WarehouseTransferOrder::getInboundCode, query.inboundCode())
+            .eq(StringUtils.hasText(query.operatingWarehouseId()), WarehouseTransferOrder::getOperatingWarehouseId, query.operatingWarehouseId())
+            .like(StringUtils.hasText(query.fbaWarehouseCode()), WarehouseTransferOrder::getFbaWarehouseCode, query.fbaWarehouseCode())
+            .eq(StringUtils.hasText(query.status()), WarehouseTransferOrder::getStatus, query.status())
+            .eq(query.needRelabel() != null, WarehouseTransferOrder::getNeedRelabel, query.needRelabel())
+            .ge(query.createdFrom() != null, WarehouseTransferOrder::getCreatedAt, query.createdFrom())
+            .le(query.createdTo() != null, WarehouseTransferOrder::getCreatedAt, query.createdTo())
+            .orderByDesc(WarehouseTransferOrder::getCreatedAt).orderByDesc(WarehouseTransferOrder::getId);
+        Page<WarehouseTransferOrder> result = transfers.selectPage(Page.of(query.page(), query.size()), wrapper);
+        List<WarehouseTransferResponses.Summary> records = result.getRecords().stream().map(value ->
+            new WarehouseTransferResponses.Summary(value.getId(), value.getTransferNo(), value.getInboundCode(),
+                value.getLastlegOrderId(), value.getLastlegOrderNo(), value.getOperatingWarehouseId(),
+                value.getFbaWarehouseCode(), value.getPackageCount(), value.getDeliveryMethod(),
+                Boolean.TRUE.equals(value.getNeedRelabel()), value.getRelabelNo(), value.getStatus(),
+                value.getEstimatedArrivalAt(), value.getCreatedAt())).toList();
+        return new PageResult<>(records, result.getCurrent(), result.getSize(), result.getTotal(), result.getPages());
+    }
+
    @Transactional(readOnly = true)
    public WarehouseTransferResponses.Detail detail(String customerId, String transferNo) {
        WarehouseTransferOrder transfer = transfers.findNo(customerId, transferNo);