优化

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/controller/PlatformOceanBookingController.java

@@ -37,10 +37,10 @@ public class PlatformOceanBookingController {
 
     @PostMapping @PreAuthorize("hasAuthority('platform:firstleg:ocean-booking:create')")
     @BusinessAudit(event="OCEAN_BOOKING_CREATE", resourceType="OCEAN_BOOKING", description="创建海运订舱单", captureBefore=false)
-    public ApiResponse<Detail> create(@AuthenticationPrincipal AuthenticatedUser user, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody CreateRequest request) { FirstlegScopeGuard.platform(user, request.data().customerId()); return ApiResponse.success(service.create(user.userId(), user.username(), key, request)); }
+    public ApiResponse<Detail> create(@AuthenticationPrincipal AuthenticatedUser user, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody CreateRequest request) { validateOptionalCustomer(user, request.data().customerId()); return ApiResponse.success(service.create(user.userId(), user.username(), key, request)); }
     @PutMapping("/{oceanBookingId}") @PreAuthorize("hasAuthority('platform:firstleg:ocean-booking:edit')")
     @BusinessAudit(event="OCEAN_BOOKING_UPDATE", resourceType="OCEAN_BOOKING", resourceId="#oceanBookingId", description="编辑海运订舱草稿")
-    public ApiResponse<Detail> updateDraft(@AuthenticationPrincipal AuthenticatedUser user, @PathVariable @Positive long oceanBookingId, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody UpdateDraftRequest request) { FirstlegScopeGuard.platform(user, request.data().customerId()); return ApiResponse.success(service.updateDraft(oceanBookingId, user.userId(), user.username(), key, request)); }
+    public ApiResponse<Detail> updateDraft(@AuthenticationPrincipal AuthenticatedUser user, @PathVariable @Positive long oceanBookingId, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody UpdateDraftRequest request) { validateOptionalCustomer(user, request.data().customerId()); return ApiResponse.success(service.updateDraft(oceanBookingId, user.userId(), user.username(), key, request)); }
     @PostMapping("/{oceanBookingId}/submit") @PreAuthorize("hasAuthority('platform:firstleg:ocean-booking:submit')")
     @BusinessAudit(event="OCEAN_BOOKING_SUBMIT", resourceType="OCEAN_BOOKING", resourceId="#oceanBookingId", description="提交海运订舱")
     public ApiResponse<Detail> submit(@AuthenticationPrincipal AuthenticatedUser user, @PathVariable @Positive long oceanBookingId, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody ActionRequest request) { FirstlegScopeGuard.platform(user); return ApiResponse.success(service.submit(oceanBookingId, user.userId(), user.username(), key, request)); }
@@ -68,4 +68,5 @@ public class PlatformOceanBookingController {
     @PostMapping("/{oceanBookingId}/allocations") @PreAuthorize("hasAuthority('platform:firstleg:ocean-booking:allocate')")
     @BusinessAudit(event="OCEAN_BOOKING_ALLOCATE_CONTAINER", resourceType="OCEAN_BOOKING", resourceId="#oceanBookingId", description="分配订舱柜次")
     public ApiResponse<Detail> allocate(@AuthenticationPrincipal AuthenticatedUser user, @PathVariable @Positive long oceanBookingId, @RequestHeader("Idempotency-Key") String key, @Valid @RequestBody AllocationRequest request) { FirstlegScopeGuard.platform(user); return ApiResponse.success(service.allocate(oceanBookingId, user.userId(), user.username(), key, request)); }
+    private static void validateOptionalCustomer(AuthenticatedUser user, Long customerId) { FirstlegScopeGuard.platform(user); if (customerId != null) FirstlegScopeGuard.platform(user, customerId); }
 }

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/dto/OceanBookingDtos.java

@@ -39,8 +39,8 @@ public final class OceanBookingDtos {
                                               @NotNull @jakarta.validation.constraints.DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg,
                                               @NotNull @Positive Integer quantity) {}
 
-    public record DraftData(@NotNull @Positive Long customerId,
-                            @NotBlank @Size(max = 128) String customerName,
+    public record DraftData(@Positive Long customerId,
+                            @Size(max = 128) String customerName,
                             @NotBlank @Size(max = 64) String channelCode,
                             @NotNull @Positive Long warehouseId,
                             @NotBlank @Size(max = 128) String warehouseName,
@@ -56,8 +56,8 @@ public final class OceanBookingDtos {
                             @Size(max = 32) String destinationPortCode,
                             @Size(max = 128) String destinationPortName,
                             @Size(max = 128) String placeOfDelivery,
-                            @Size(max = 32) String serviceTerm,
-                            @Size(max = 32) String freightTerm,
+                            @NotBlank @Size(max = 32) String serviceTerm,
+                            @NotBlank @Size(max = 32) String freightTerm,
                             LocalDateTime estimatedSailingAt,
                             LocalDateTime estimatedArrivalAt,
                             @Size(max = 1000) String remark,

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java

@@ -286,6 +286,12 @@ public class OceanBookingService {
     private static void requireStatus(OceanBookingEntity value, OceanBookingStatus status) { if (!status.name().equals(value.getStatus())) throw conflict("订舱状态不允许当前操作"); }
 
     private void validateDraftStructure(DraftData data) {
+        boolean hasCustomerId = data.customerId() != null;
+        boolean hasCustomerName = StringUtils.hasText(data.customerName());
+        if (hasCustomerId != hasCustomerName) throw badRequest("客户ID和客户名称必须同时填写或同时为空");
+        if (!StringUtils.hasText(data.serviceTerm()) || !StringUtils.hasText(data.freightTerm())) {
+            throw badRequest("Service Term和Freight Term不能为空");
+        }
         if (data.estimatedSailingAt() != null || data.estimatedArrivalAt() != null
             || StringUtils.hasText(data.billOfLadingNo()) || StringUtils.hasText(data.vesselName())
             || StringUtils.hasText(data.voyageNo())) {
@@ -329,7 +335,7 @@ public class OceanBookingService {
     }
 
     private static void copy(OceanBookingEntity v, DraftData d, String resolvedChannelName) {
-        v.setCustomerId(d.customerId()); v.setCustomerName(d.customerName().trim());
+        v.setCustomerId(d.customerId()); v.setCustomerName(trim(d.customerName()));
         v.setChannelCode(d.channelCode().trim()); v.setChannelName(resolvedChannelName);
         v.setWarehouseId(d.warehouseId()); v.setWarehouseName(d.warehouseName().trim());
         v.setBillOfLadingNo(null);