Refactor billing options retrieval to include data permissions and add effective date handling for product imports

This commit is contained in:
wuweihua
2026-10-09 09:27:28 +08:00
parent fea34d1d10
commit c95a9861cc
42 changed files with 984 additions and 219 deletions
@@ -23,9 +23,9 @@ public class BmsProduct extends BaseEntity
private String updateNote;
/** TAX_INCLUDED / TAX_EXCLUDED */
private String taxMode;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date effectiveDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expireDate;
/** 0 pending, 1 active, 2 expired */
public static final String STATUS_PENDING = "0";
@@ -31,10 +31,10 @@ public class BmsProductCountry implements Serializable
private String sizeLimit;
private String lastMile;
private String leadTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date effectiveDate;
/** null=open; closed to next import effective_date */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expireDate;
/** 0 pending, 1 active, 2 expired */
private String status;
@@ -20,6 +20,10 @@ public class PrcIncomeBillFee implements Serializable
private String feeName;
private Long scId;
private BigDecimal amount;
/** 产品价(目录价,基础运费/挂号费明细对应分摊) */
private BigDecimal productAmount;
/** 红线价(预留) */
private BigDecimal redlineAmount;
private String currency;
private String roundMode;
private String remark;
@@ -37,6 +37,8 @@ public class PrcOrderBill extends BaseEntity
private String settlementManCode;
/** 客服员 */
private String serviceMan;
/** 客服员编码 */
private String serviceManCode;
private Long customerId;
private String customerCode;
private String customerName;
@@ -33,6 +33,8 @@ public class TmsPriceBillRequest extends TmsPriceQuoteRequest
private String settlementManCode;
/** 客服员 */
private String serviceMan;
/** 客服员编码 */
private String serviceManCode;
private String customerName;
private Integer pieces;
private BigDecimal actualWeight;
@@ -16,6 +16,10 @@ public class TmsPriceQuoteFeeLine implements Serializable
/** surcharge config id, 0 for freight/registration */
private Long scId;
private BigDecimal amount;
/** 产品价(目录价分摊) */
private BigDecimal productAmount;
/** 红线价(预留) */
private BigDecimal redlineAmount;
private String currency;
private String roundMode;
private String remark;
@@ -91,6 +91,8 @@ public class TmsPriceQuoteResult implements Serializable
private String settlementManCode;
/** 客服员 */
private String serviceMan;
/** 客服员编码 */
private String serviceManCode;
private String customerCode;
private String customerName;
/** ACTIVE / MISSING / DISABLED */