优化

firstleg/src/main/java/com/baiyue/firstleg/dto/FeeItemDtos.java

@@ -4,6 +4,9 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import java.math.BigDecimal;
 
 /** 费用项目请求模型。 */
 public final class FeeItemDtos {
@@ -21,26 +24,9 @@ public final class FeeItemDtos {
         @NotNull Boolean warehousePayable,
         @NotNull Boolean warehouseReceivable,
         @NotNull Boolean allocationFee,
-        @Size(max = 500) String description
+        @Size(max = 500) String description,
+        @DecimalMin("0.00") @Digits(integer = 10, fraction = 2) BigDecimal defaultPrice
     ) {
-        public SaveRequest(String category, String tradeScope, String feeCode,
-                           String feeTypeName, Boolean pickupPayable,
-                           Boolean pickupReceivable, Boolean warehousePayable,
-                           Boolean warehouseReceivable, Boolean allocationFee,
-                           String description) {
-            this(category, tradeScope, feeCode, null, feeTypeName, pickupPayable,
-                pickupReceivable, warehousePayable, warehouseReceivable,
-                allocationFee, description);
-        }
-
-        /** Backward-compatible constructor for callers predating the stable fee code. */
-        public SaveRequest(String category, String tradeScope, String feeTypeName,
-                           Boolean pickupPayable, Boolean pickupReceivable,
-                           Boolean warehousePayable, Boolean warehouseReceivable,
-                           Boolean allocationFee, String description) {
-            this(category, tradeScope, null, null, feeTypeName, pickupPayable, pickupReceivable,
-                warehousePayable, warehouseReceivable, allocationFee, description);
-        }
     }
 
     public record StatusRequest(

firstleg/src/main/java/com/baiyue/firstleg/entity/FeeItemEntity.java

@@ -1,11 +1,14 @@
 package com.baiyue.firstleg.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baiyue.common.core.model.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
+import java.math.BigDecimal;
 
 /** 费用项目主数据。 */
 @Getter
@@ -20,6 +23,9 @@ public class FeeItemEntity extends BaseEntity {
     private String feeCode;
     private String supplierCategory;
     private String feeTypeName;
+    /** 业务选费时带入的默认价格，可清空且不限制实际成交金额。 */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private BigDecimal defaultPrice;
     private Boolean pickupPayable;
     private Boolean pickupReceivable;
     private Boolean warehousePayable;

firstleg/src/main/java/com/baiyue/firstleg/service/FeeItemService.java

@@ -101,6 +101,7 @@ public class FeeItemService {
         }
     }
 
+    /** 保存项目属性及可清空的默认价格，实际费用仍以业务录入金额为准。 */
     private static void copy(FeeItemEntity value, SaveRequest request) {
         boolean payable = Boolean.TRUE.equals(request.pickupPayable())
             || Boolean.TRUE.equals(request.warehousePayable());
@@ -111,6 +112,7 @@ public class FeeItemService {
         value.setSupplierCategory(payable
             ? FeeItemSupplierCategory.normalize(request.supplierCategory()) : null);
         value.setFeeTypeName(request.feeTypeName().trim());
+        value.setDefaultPrice(request.defaultPrice());
         value.setPickupPayable(request.pickupPayable());
         value.setPickupReceivable(request.pickupReceivable());
         value.setWarehousePayable(request.warehousePayable());

firstleg/src/main/resources/db/phase2-fee-item-and-inbound-detail.sql

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS fl_fee_item (
   fee_code VARCHAR(50) NOT NULL COMMENT '稳定费用编码；平台公共主数据固定编码',
   supplier_category VARCHAR(16) NULL COMMENT 'PAYABLE供应商类别约束；为空时可选任意ACTIVE供应商',
   fee_type_name VARCHAR(128) NOT NULL COMMENT '费用类型名称',
+  default_price DECIMAL(12,2) NULL COMMENT '默认价格CNY；仅选费带入，实际费用可修改',
   pickup_payable TINYINT(1) NOT NULL DEFAULT 0 COMMENT '提柜应付是否参与',
   pickup_receivable TINYINT(1) NOT NULL DEFAULT 0 COMMENT '提柜应收是否参与',
   warehouse_payable TINYINT(1) NOT NULL DEFAULT 0 COMMENT '仓储应付是否参与',

firstleg/src/main/resources/openapi/fee-item-v1.yaml

@@ -102,6 +102,7 @@ components:
         feeCode: {type: string, maxLength: 50, pattern: '^[A-Za-z0-9_-]+$'}
         supplierCategory: {type: string, enum: [BOOKING, CUSTOMS, TRUCKING, CERTIFICATE], nullable: true, description: PAYABLE供应商类别约束；为空时可选任意ACTIVE Warehouse Supplier}
         feeTypeName: {type: string, maxLength: 128}
+        defaultPrice: {type: number, nullable: true, minimum: 0, maximum: 9999999999.99, multipleOf: 0.01, description: 默认价格CNY；为空不自动带价，业务录入时可修改，不追改已有费用}
         pickupPayable: {type: boolean}
         pickupReceivable: {type: boolean}
         warehousePayable: {type: boolean}
@@ -118,6 +119,7 @@ components:
         feeCode: {type: string}
         supplierCategory: {type: string, enum: [BOOKING, CUSTOMS, TRUCKING, CERTIFICATE], nullable: true, description: PAYABLE供应商类别约束；为空时可选任意ACTIVE Warehouse Supplier}
         feeTypeName: {type: string}
+        defaultPrice: {type: number, nullable: true, minimum: 0, maximum: 9999999999.99, multipleOf: 0.01, description: 默认价格CNY；仅用于业务选择费用项目时带入}
         pickupPayable: {type: boolean}
         pickupReceivable: {type: boolean}
         warehousePayable: {type: boolean}