修改计费信息表结构

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

@@ -0,0 +1,26 @@
+package com.ruoyi.price.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/** receivable fee detail prc_income_bill_fee */
+@Data
+public class PrcIncomeBillFee implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    private String feeId;
+    private String billId;
+    private String feeType;
+    private String feeName;
+    private Long scId;
+    private BigDecimal amount;
+    private String currency;
+    private String roundMode;
+    private String remark;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

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

@@ -8,10 +8,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/** receivable bill header prc_bill */
+/** order info header prc_order_bill */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PrcBill extends BaseEntity
+public class PrcOrderBill extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -66,9 +66,13 @@ public class PrcBill extends BaseEntity
     private BigDecimal registrationFee;
     private BigDecimal freightAmount;
     private BigDecimal surchargeAmount;
-    private BigDecimal payableTotal;
+    /** receivable total */
+    private BigDecimal incomeTotal;
+    /** payable total */
+    private BigDecimal payTotal;
     private String currency;
     private String roundMode;
 
-    private List<PrcBillFee> fees;
+    private List<PrcIncomeBillFee> incomeFees;
+    private List<PrcPayBillFee> payFees;
 }

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

@@ -6,9 +6,9 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-/** receivable bill fee detail prc_bill_fee */
+/** payable fee detail prc_pay_bill_fee */
 @Data
-public class PrcBillFee implements Serializable
+public class PrcPayBillFee implements Serializable
 {
     private static final long serialVersionUID = 1L;
 

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

@@ -47,6 +47,11 @@ public class TmsPriceQuoteResult implements Serializable
     private BigDecimal freightAmount;
     /** 附加费合计（按产品关联命中后汇总） */
     private BigDecimal surchargeAmount;
+    /** receivable total (order bill) */
+    private BigDecimal incomeTotal;
+    /** payable total (order bill); also quote payable */
+    private BigDecimal payTotal;
+    /** quote / legacy field; same as incomeTotal for bill sync */
     private BigDecimal payableTotal;
     private String currency = "CNY";
     /** UP / DOWN / HALF_UP */