修改产品功能

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

@@ -7,7 +7,7 @@ import com.bms.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/** BMS产品主表 bms_product */
+/** BMS产品主表 product */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class BmsProduct extends BaseEntity

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

@@ -6,19 +6,15 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-/** 产品国家服务明细 bms_product_country */
+/** 产品国家服务明细 product_country */
 @Data
 public class BmsProductCountry implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     private Long detailId;
-    /** FK to bms_product.product_id (one country version belongs to one product row) */
+    /** FK to product.product_id */
     private Long productId;
-    /** FK to bms_product_price_version.ppv_id */
-    private Long ppvId;
-    /** Display only: joined from bms_product_price_version.version_no */
-    private String versionNo;
     private String productCode;
     private String countryName;
     private String countryCode;

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

@@ -1,32 +0,0 @@
-package com.bms.price.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.bms.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/** Product base price version bms_product_price_version */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class BmsProductPriceVersion extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    private Long ppvId;
-    private String productCode;
-    /** Linked bms_product.product_id for this version row */
-    private Long productId;
-    /** V1 / V2 */
-    private String versionNo;
-    private Integer versionSeq;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date effectiveDate;
-    /** null = open; set to next version effective_date when that version starts */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expireDate;
-    /** 0 pending / 1 active / 2 expired */
-    private String status;
-    /** query only: product count for this effective_date option */
-    private Integer productCount;
-}

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

@@ -30,16 +30,16 @@ public class PrcPriceSetDetail implements Serializable
     private Long zdId;
     private Long wsdId;
     private String weightLabel;
-    /** KG inclusive, same as bms_product_country */
+    /** KG inclusive, same as product_country */
     private BigDecimal weightMin;
     private BigDecimal weightMax;
-    /** bms_product_country.detail_id */
+    /** product_country.detail_id */
     private Long productCountryId;
     private BigDecimal fvValue;
     private BigDecimal fvRegistrationFee;
-    /** product base freight from bms_product_country (display only) */
+    /** product base freight from product_country (display only) */
     private BigDecimal baseFreightPrice;
-    /** product base registration from bms_product_country (display only) */
+    /** product base registration from product_country (display only) */
     private BigDecimal baseRegistrationFee;
     private BigDecimal discountValue;
     /** UP / DOWN / HALF_UP */

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

@@ -52,6 +52,10 @@ public class PrcQuote extends BaseEntity
     private BigDecimal freightAmount;
     private BigDecimal surchargeAmount;
     private BigDecimal payableTotal;
+    private BigDecimal productAmount;
+    private BigDecimal redlineAmount;
+    private BigDecimal costAmount;
+    private BigDecimal payTotal;
     private String currency;
     private String roundMode;
 

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

@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * 附加费与产品/明细关联 prc_surcharge_rel
- * 同时携带附加费展示字段（JOIN prc_surcharge）与明细展示字段（LEFT JOIN bms_product_country），
+ * 同时携带附加费展示字段（JOIN prc_surcharge）与明细展示字段（LEFT JOIN product_country），
  * 便于产品列表抽屉直接渲染。
  *
  * 语义：

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

@@ -44,7 +44,7 @@ public class TmsPriceQuoteResult implements Serializable
     private BigDecimal weightMax;
     private String weightLabel;
     private Date bizDate;
-    /** bms_product_country.effective_date */
+    /** product_country.effective_date */
     private Date effectiveDate;
 
     private BigDecimal weight;
@@ -56,6 +56,12 @@ public class TmsPriceQuoteResult implements Serializable
     private BigDecimal freightAmount;
     /** 附加费合计（按产品关联命中后汇总） */
     private BigDecimal surchargeAmount;
+    /** product catalog total: base freight*weight + base registration (no package surcharge) */
+    private BigDecimal productAmount;
+    /** redline total reserved */
+    private BigDecimal redlineAmount;
+    /** cost total (currently = product catalog amount) */
+    private BigDecimal costAmount;
     /** receivable total (order bill) */
     private BigDecimal incomeTotal;
     /** payable total (order bill); also quote payable */