优化

firstleg/src/test/java/com/baiyue/firstleg/controller/FeeManagementContractTest.java

@@ -96,6 +96,10 @@ class FeeManagementContractTest {
         Map<String, Object> schemas = stringMap(stringMap(document.get("components")).get("schemas"));
         assertThat(schemas).containsKeys("FeeItemSaveRequest", "FeeItemResource", "FeeItemPage",
             "FeeItemApiResponse", "FeeItemPageApiResponse", "VoidApiResponse");
+        for (String schema : List.of("FeeItemSaveRequest", "FeeItemResource")) {
+            assertThat(stringMap(properties(schemas, schema).get("defaultPrice")))
+                .containsEntry("nullable", true).containsEntry("minimum", 0);
+        }
         for (String response : List.of("FeeItemApiResponse", "FeeItemPageApiResponse", "VoidApiResponse")) {
             assertThat(list(stringMap(schemas.get(response)).get("required"))).contains("timestamp");
             assertThat(properties(schemas, response)).containsKeys(

firstleg/src/test/java/com/baiyue/firstleg/service/FeeManagementServiceTest.java

@@ -110,6 +110,7 @@ class FeeManagementServiceTest {
 
         assertThat(created.getId()).isEqualTo(11L);
         assertThat(created.getAllocationFee()).isTrue();
+        assertThat(created.getDefaultPrice()).isEqualByComparingTo("60.00");
         assertThat(created.getWarehouseReceivable()).isTrue();
         assertThat(created.getWarehousePayable()).isTrue();
         assertThat(created.getSupplierCategory()).isNull();
@@ -122,7 +123,7 @@ class FeeManagementServiceTest {
     @DisplayName("自定义费用编码统一转为大写并检查客户内唯一性")
     void normalizesCustomFeeCode() {
         FeeItemDtos.SaveRequest request = new FeeItemDtos.SaveRequest("仓储成本", "INTERNATIONAL",
-            "storage_fee", "仓库租赁费", false, false, true, true, true, "应付仓库租赁费");
+            "storage_fee", null, "仓库租赁费", false, false, true, true, true, "应付仓库租赁费", null);
 
         FeeItemEntity created = feeItems.create(9L, "admin", request);
 
@@ -134,7 +135,7 @@ class FeeManagementServiceTest {
     @DisplayName("并发创建相同费用编码返回业务冲突")
     void rejectsConcurrentDuplicateFeeCode() {
         FeeItemDtos.SaveRequest request = new FeeItemDtos.SaveRequest("仓储成本", "INTERNATIONAL",
-            "STORAGE_FEE", "仓库租赁费", false, false, true, true, true, null);
+            "STORAGE_FEE", null, "仓库租赁费", false, false, true, true, true, null, null);
         doThrow(new DuplicateKeyException("duplicate fee code")).when(repository).insertItem(any());
 
         assertThatThrownBy(() -> feeItems.create(9L, "admin", request))
@@ -156,6 +157,38 @@ class FeeManagementServiceTest {
         verify(repository, never()).itemCodeExists("STORAGE_FEE", 11L);
     }
 
+    /** 清空默认价只修改公共项目，不触碰已生成的费用。 */
+    @Test
+    void clearsDefaultPrice() {
+        FeeItemEntity existing = item(true, true);
+        existing.setDefaultPrice(new BigDecimal("60.00"));
+        when(repository.findItem(11L)).thenReturn(existing);
+        when(repository.updateItem(any())).thenReturn(1);
+        FeeItemDtos.SaveRequest request = new FeeItemDtos.SaveRequest("仓储成本", "INTERNATIONAL",
+            null, null, "仓库租赁费", false, false, true, true, true, null, null);
+
+        assertThat(feeItems.update(11L, 9L, "admin", request).getDefaultPrice()).isNull();
+        verify(repository).updateItem(existing);
+    }
+
+    /** 请求价格允许空值和零元，拒绝负数、过多小数和超出字段范围的金额。 */
+    @Test
+    void validatesDefaultPrice() {
+        try (var factory = jakarta.validation.Validation.buildDefaultValidatorFactory()) {
+            var validator = factory.getValidator();
+            for (String price : List.of("0", "60.25", "9999999999.99")) {
+                var request = new FeeItemDtos.SaveRequest("仓储成本", "DOMESTIC", null, null,
+                    "操作费", false, true, false, false, false, null, new BigDecimal(price));
+                assertThat(validator.validate(request)).isEmpty();
+            }
+            for (String price : List.of("-1", "60.255", "10000000000")) {
+                var request = new FeeItemDtos.SaveRequest("仓储成本", "DOMESTIC", null, null,
+                    "操作费", false, true, false, false, false, null, new BigDecimal(price));
+                assertThat(validator.validate(request)).isNotEmpty();
+            }
+        }
+    }
+
     @Test
     @DisplayName("任一客户引用公共费用项目后都禁止删除")
     void rejectsDeletingItemBoundByAnyCustomer() {
@@ -478,9 +511,10 @@ class FeeManagementServiceTest {
             eq(10001L), eq(21L), eq(31L), eq(1), any(LocalDateTime.class));
     }
 
+    /** 构造带默认价格的公共费用项目。 */
     private static FeeItemDtos.SaveRequest itemRequest() {
-        return new FeeItemDtos.SaveRequest("仓储成本", "INTERNATIONAL", "仓库租赁费",
-            false, false, true, true, true, "应付仓库租赁费");
+        return new FeeItemDtos.SaveRequest("仓储成本", "INTERNATIONAL", null, null, "仓库租赁费",
+            false, false, true, true, true, "应付仓库租赁费", new BigDecimal("60.00"));
     }
 
     private static InboundFeeDetailDtos.SaveRequest detailRequest(String direction) {