Enhance surcharge management by adding support for price type filtering in SurchargeController and related services. Introduce new methods for handling redline product codes in mappers and services. Update front-end API to accommodate price type parameters in surcharge queries. Modify database schema to include redline product and country tables for improved surcharge calculations.

bms-back/bms-system/src/main/java/com/bms/price/domain/BmsRedlineProduct.java

@@ -0,0 +1,46 @@
+package com.bms.price.domain;
+
+import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.bms.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/** Redline catalog main table redline_product */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BmsRedlineProduct extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long productId;
+    private String productCode;
+    private String productName;
+    private String serviceLevel;
+    private String cargoAttr;
+    private String destRegion;
+    private String updateNote;
+    /** TAX_INCLUDED / TAX_EXCLUDED */
+    private String taxMode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effectiveDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date expireDate;
+    /** 0 pending, 1 active, 2 expired */
+    public static final String STATUS_PENDING = "0";
+    public static final String STATUS_ACTIVE = "1";
+    public static final String STATUS_EXPIRED = "2";
+    private String status;
+    private String sourceSheet;
+    /** FK prc_price_excel_file.pef_id */
+    private Long pefId;
+    private Long tmsId;
+    private Integer countryCount;
+    private Integer surchargeCount;
+    private List<BmsRedlineProductCountry> countries;
+    /** query alias of status (0/1/2) */
+    private String effectStatus;
+    /** query: active = status in (0,1); expired = status 2 */
+    private String statusGroup;
+}

bms-back/bms-system/src/main/java/com/bms/price/domain/BmsRedlineProductCountry.java

@@ -0,0 +1,49 @@
+package com.bms.price.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/** Redline country detail table redline_product_country */
+@Data
+public class BmsRedlineProductCountry implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long detailId;
+    /** FK to product.product_id */
+    private Long productId;
+    private String productCode;
+    private String countryName;
+    private String countryCode;
+    /** prc_zone.zone_id; null when product country has no zone */
+    private Long zoneId;
+    /** e.g. Z1; null when no zone */
+    private String zoneCode;
+    /** e.g. Australia(Z1); null when no zone */
+    private String zoneName;
+    private BigDecimal weightMin;
+    private BigDecimal weightMax;
+    private BigDecimal freightPrice;
+    private BigDecimal registrationFee;
+    private String sizeLimit;
+    private String lastMile;
+    private String leadTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effectiveDate;
+    /** null=open; closed to next import effective_date */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date expireDate;
+    /** 0 pending, 1 active, 2 expired */
+    private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** query only: true = expire_date is null */
+    private Boolean openOnly;
+    /** query alias of status (0/1/2) */
+    private String effectStatus;
+}

bms-back/bms-system/src/main/java/com/bms/price/domain/BmsRedlineProductImportTask.java

@@ -0,0 +1,72 @@
+package com.bms.price.domain;
+
+import java.io.Serializable;
+
+/**
+ * Async product Excel import progress (Redis).
+ */
+public class BmsRedlineProductImportTask implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    public static final String STATUS_PENDING = "PENDING";
+    public static final String STATUS_RUNNING = "RUNNING";
+    public static final String STATUS_SUCCESS = "SUCCESS";
+    public static final String STATUS_FAIL = "FAIL";
+
+    private String taskId;
+    private String status;
+    private int percent;
+    private String message;
+    private String error;
+
+    public String getTaskId()
+    {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId)
+    {
+        this.taskId = taskId;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public int getPercent()
+    {
+        return percent;
+    }
+
+    public void setPercent(int percent)
+    {
+        this.percent = percent;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
+
+    public String getError()
+    {
+        return error;
+    }
+
+    public void setError(String error)
+    {
+        this.error = error;
+    }
+}

bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteResult.java

@@ -58,8 +58,10 @@ public class TmsPriceQuoteResult implements Serializable
     private BigDecimal surchargeAmount;
     /** product catalog total: base freight*weight + base registration (no package surcharge) */
     private BigDecimal productAmount;
-    /** redline total reserved */
+    /** redline total from redline_product_country (+ REDLINE surcharges) */
     private BigDecimal redlineAmount;
+    /** matched redline_product_country.detail_id for REDLINE surcharge scope */
+    private Long redlineCountryId;
     /** cost total (currently = product catalog amount) */
     private BigDecimal costAmount;
     /** receivable total (order bill) */