Merge branch 'dev-lyhfive' of http://git.buggoglobal.com/java-project/baiyue-firstleg into dev

lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderDetailResponse.java

@@ -1,6 +1,7 @@
 package com.baiyue.lastleg.dto;
 
 import com.baiyue.lastleg.entity.LastlegOrderDetail;
+import com.baiyue.lastleg.entity.LastlegOrderFee;
 
 import java.time.LocalDateTime;
 
@@ -9,7 +10,10 @@ import java.util.List;
 public record LastlegOrderDetailResponse(
     LastlegOrderSummary order,
     List<LastlegOrderDetail> cargo,
-    List<History> statusHistory
+    List<History> statusHistory,
+    List<LastlegOrderFee> fees,
+    List<Operation> operationHistory
 ) {
     public record History(Long id, String fromStatus, String toStatus, String remark, LocalDateTime createdAt) {}
+    public record Operation(Long id, String operationNode, String operatorName, String result, LocalDateTime createdAt) {}
 }

lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderRequests.java

@@ -5,7 +5,11 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -14,8 +18,8 @@ public final class LastlegOrderRequests {
     }
 
     public record Query(
-        @Min(1) long page,
-        @Min(1) @Max(200) long size,
+        @Min(1) Long page,
+        @Min(1) @Max(200) Long size,
         String orderNo,
         String orderType,
         String inboundCode,
@@ -31,8 +35,8 @@ public final class LastlegOrderRequests {
         LocalDateTime createdTo
     ) {
         public Query {
-            if (page == 0) page = 1;
-            if (size == 0) size = 20;
+            if (page == null || page == 0) page = 1L;
+            if (size == null || size == 0) size = 20L;
         }
     }
 
@@ -68,4 +72,30 @@ public final class LastlegOrderRequests {
             return new TransferDestination(List.of(orderId), warehouseId, warehouseCode, warehouseName, remark);
         }
     }
+
+    public record CreateFee(
+        @NotBlank @Size(max = 128) String feeItem,
+        @NotBlank @Pattern(regexp = "[A-Z]{3}") String currency,
+        @NotNull @DecimalMin(value = "0.01") BigDecimal amount,
+        @NotBlank @Pattern(regexp = "PENDING_REVIEW|APPROVED|REJECTED") String status,
+        @Size(max = 500) String supplierDescription
+    ) {
+    }
+
+    public record SetDetained(
+        @NotNull Boolean detained,
+        @NotBlank @Size(max = 500) String remark
+    ) {
+    }
+
+    public record SetPalletMergeRequired(
+        @NotNull Boolean palletMergeRequired
+    ) {
+    }
+
+    public record SetPalletMergeBatch(
+        @NotEmpty @Size(max = 200) List<Long> orderIds,
+        @NotNull Boolean palletMergeRequired
+    ) {
+    }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderSummary.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "按入仓单编码粒度展示的尾程订单列表行")
 public record LastlegOrderSummary(
@@ -40,6 +41,9 @@ public record LastlegOrderSummary(
     String relabelOrderNo,
     String relabelStatus,
     String palletMergeFlag,
+    String palletMergeBatchId,
+    @Schema(description = "同一合托组内其他来源入仓单的入仓码")
+    List<String> palletMergeInboundNos,
     String currentStatus,
     String subOrderStatus,
     String privateRemark,