修改产品价格显示

This commit is contained in:
wuweihua
2026-09-09 17:06:50 +08:00
parent fddd8f0586
commit e265656060
30 changed files with 771 additions and 194 deletions
@@ -25,16 +25,18 @@ public class BmsProduct extends BaseEntity
private String taxMode;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date effectiveDate;
/** 0启用(按日期展示已生效/待生效) 1已失效 */
@JsonFormat(pattern = "yyyy-MM-dd")
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;
private Long tmsId;
private Integer countryCount;
private Integer surchargeCount;
private List<BmsProductCountry> countries;
/**
* 查询用:ACTIVE已生效 / PENDING待生效 / EXPIRED已失效
* (非表字段,由生效日期+status 推导)
*/
/** query alias of status (0/1/2) */
private String effectStatus;
}
@@ -13,6 +13,8 @@ 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) */
private Long productId;
private String productCode;
private String countryName;
private String countryCode;
@@ -28,12 +30,14 @@ public class BmsProductCountry implements Serializable
/** null=open; closed to next import effective_date */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expireDate;
/** 0 pending, 1 active, 2 expired */
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
/** query only: true = expire_date is null */
private Boolean openOnly;
/** query only: ACTIVE已生效 / PENDING待生效 / EXPIRED已失效(按生效/失效日期与当前日期派生) */
/** query alias of status (0/1/2) */
private String effectStatus;
}
@@ -47,7 +47,7 @@ public class TmsPriceQuoteResult implements Serializable
/** 附加费合计(按产品关联命中后汇总) */
private BigDecimal surchargeAmount;
private BigDecimal payableTotal;
private String currency = "RMB";
private String currency = "CNY";
/** UP / DOWN / HALF_UP */
private String roundMode;
/** 费用明细:运费/挂号费各一行,附加费按具体名称各一行 */