货主结算单详情接口优化

performance-api/src/main/java/com/clx/settlement/vo/pc/CarrierSettlementOwnerDetailVO.java

@@ -33,6 +33,9 @@ public class CarrierSettlementOwnerDetailVO {
     @ApiModelProperty(value = "结算子单号", example = "JS012")
     private String settlementSubNo;
 
+    @ApiModelProperty(value = "订单编号", example = "123")
+    private String orderNo;
+
     @ApiModelProperty(value = "运单编号", example = "123")
     private String childNo;
 
@@ -80,6 +83,15 @@ public class CarrierSettlementOwnerDetailVO {
     @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
     private String payeeBankCardNo;
 
+    @ApiModelProperty(value = "付款凭证", example = "/a.png")
+    private String paymentImg;
+
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
     @ApiModelProperty(value = "公司名称", example = "公司名称")
     private String companyName;
 
@@ -125,8 +137,11 @@ public class CarrierSettlementOwnerDetailVO {
     @ApiModelProperty(value = "状态Msg 1-待锁定,2-待对账,3-待货主确认,4-待货主付款,5-付款待确认,6-待邮寄发票,7-待平台付款,8-已完结,9-已驳回", example = "待锁定")
     private String statusMsg;
 
-    @ApiModelProperty(value = "合并结算单时间", example = "2023-01-01 00:00:00")
-    private String mergeTime;
+    @ApiModelProperty(value = "驳回原因", example = "驳回原因")
+    private String remark;
+
+    @ApiModelProperty(value = "创建时间", example = "2023-01-01 00:00:00")
+    private String createTime;
 
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/SettlementOwner.java

@@ -31,6 +31,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private String ownerName;                       //货主名称
     private String settlementNo;                    //结算单编号
     private String settlementSubNo;                 //结算子单号
+    private String orderNo;                         //订单编号
     private String childNo;                         //运单编号
     private BigDecimal weight;                      //实际净重（吨）
     private BigDecimal freight;                     //实际运费（分）
@@ -44,6 +45,9 @@ public class SettlementOwner implements HasKey<Integer> {
     private String payee;                           //收款人
     private String payeeBankName;                   //收款银行
     private String payeeBankCardNo;                //收款银行卡卡号
+    private String paymentImg;                      //付款凭证
+    private String paymentBankName;                   //付款银行
+    private String paymentBankCardNo;                //付款银行卡卡号
     private String companyName;                     //公司名称
     private String companyTaxCode;                  //企业税号
     private String companyAddress;                  //公司地址
@@ -57,6 +61,9 @@ public class SettlementOwner implements HasKey<Integer> {
     private String expressNo;                       //快递编号
     private Integer invoiceStatus;                  //开票状态
     private Integer status;                         //状态
+    private String remark;                         //备注
+    private Integer mergeStatus;                         //是否合并 0-否，1-是
+    private String mergedBy;                         //合并人
     private LocalDateTime mergeTime;                       //合并结算单时间
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间