运单详情

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerDetailEnum.java

+package com.clx.performance.enums.settle;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+
+public enum SettlementOwnerDetailEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(InvoiceStatus::getMsg).orElse(null);
+        }
+    }
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum FinalPaymentStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+        NO_REQUIRE(2,"无需支付")
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<FinalPaymentStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(FinalPaymentStatus::getMsg).orElse(null);
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementOwnerDetailParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageOwnerSettlementOwnerDetailParam extends PageParam {
+
+    @NotBlank(message = "结算单编号不能为空")
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+    @ApiModelProperty(value = "结算子单编号", example = "JS415")
+    private String settlementSubNo;
+
+}

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -30,6 +30,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private Long ownerUserNo;                       //货主用户编号
     private String ownerName;                       //货主名称
     private String settlementNo;                    //结算单号
+    private String settlementSubNo;                 //结算子单号
     private String childNo;                         //运单编号
     private String orderGoodsNo;                    //货单编号
     private String orderNo;                         //订单编号
@@ -45,6 +46,8 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private BigDecimal settlementFreight;           //结算金额（分）
     private BigDecimal invoiceFreight;              //开票金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
+    private Integer invoiceStatus;                  //开票状态 0-否,1-是
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间