提交

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;
 
@@ -55,4 +59,13 @@ 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
+    ) {
+    }
 }