Merge branch 'master' into v5.7_break_contract_reverse_20231020

performance-api/src/main/java/com/clx/performance/data/OrderChildData.java

-package com.clx.performance.data;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-
-
-@Getter
-@Setter
-@ToString
-@NoArgsConstructor
-public class OrderChildData {
-
-    @ApiModelProperty(value = "运单编号", example = "100000000")
-    private String childNo;
-
-    @ApiModelProperty(value = "运费单价(分)", example = "1.23")
-    private BigDecimal freightPrice;
-
-    @ApiModelProperty(value = "车牌号", example = "京A12345")
-    private String truckNo;
-
-    @ApiModelProperty(value="司机姓名",example = "张安")
-    private String driverName;
-
-    @ApiModelProperty(value="司机手机号",example = "12222222222")
-    private String driverMobile;
-
-    @ApiModelProperty("运单状态：10：已接单  30：前往货源地 40：到达货源地 50：装货成功 60：前往目的地 70：到达目的地 80：收货待确认")
-    private Integer status;
-
-    @ApiModelProperty(value="接单时间",example = "2020-01-01 10:10:10")
-    private String payTime;
-
-    @ApiModelProperty(value="装车时间",example = "2020-01-01 10:10:10")
-    private String loadTime;
-
-    @ApiModelProperty(value="装货净重",example = "10")
-    private BigDecimal loadNet;
-
-    @ApiModelProperty(value="卸车时间",example = "2020-01-01 10:10:10")
-    private String unloadTime;
-
-    @ApiModelProperty(value="卸货净重",example = "41")
-    private BigDecimal unloadNet;
-}

performance-api/src/main/java/com/clx/performance/enums/DriverTruckEnum.java

@@ -6,9 +6,7 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-@Getter
-@AllArgsConstructor
-@SuppressWarnings("all")
+
 public enum DriverTruckEnum {
     ;
     @Getter

performance-api/src/main/java/com/clx/performance/enums/IdTypeEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("all")
+public enum IdTypeEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        TOP_UP(1L, "充值"),
+        CASE_OUT(2L, "提现"),
+        CASE_OUT_FROZEN(3L, "提现冻结"),
+        CASE_OUT_SUCCESS(4L, "提现成功"),
+        TOP_UP_SUCCESS(5L, "充值成功"),
+        FROZEN(6L, "冻结"),
+        THAW(7L, "解冻")
+        ;
+        private final Long code;
+        private final String msg;
+
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("all")
+public enum OwnerAccountEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum AccountTypeStatus {
+        MARGIN_ACCOUNT(1, "保证金账户"),
+        PREPAID_FREIGHT_ACCOUNT(2, "预付运费账户")
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<OwnerAccountEnum.AccountTypeStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public String getMsg() {
+            return this.msg;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum TopUpStatus {
+        PENDING(10, "待审批"),
+        APPROVAL_REJECTION(20, "审批拒绝"),
+        APPROVAL_APPROVE(30, "审批通过"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CaseOutStatus {
+        PENDING_PAYMENT(10, "待付款"),
+        TO_BE_CONFIRMED(20, "待货主确认"),
+        PAID(30, "已付款"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum RunningWaterStatus {
+        TOP_UP(10, "充值"),
+        FROZEN(20, "冻结"),
+        THAW(30, "解冻"),
+        CASE_OUT_FROZEN(40, "提现冻结"),
+        CASE_OUT_SUCCESS(50, "提现成功"),
+        TAKE_OUT(60, "扣除"),
+        CASE_OUT_FAIL(70, "提现失败"),
+
+        ;
+        private final Integer code;
+        private final String msg;
+        public static Optional<OwnerAccountEnum.RunningWaterStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public String getMsg() {
+            return this.msg;
+        }
+    }
+}

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -80,6 +80,9 @@ public enum PerformanceResultEnum implements ResultEnum {
     BREAK_CONTRACT_RULE_NAME_EXIST(1601, "违约规则名称已存在"),
     BREAK_CONTRACT_RULE_NO_FOUND(1602, "违约规则不存在"),
     STATUS_CHANGED(1603, "状态已变更，请重新刷新页面"),
+    SETTLEMENT_ORDER_STATUS_CHANGED(1401, "结算单状态已变更，请重新刷新页面"),
+    SETTLEMENT_NO_FOUND(1401, "结算单不存在"),
+    MONEY_NO_SAME(1501, "货主提现金额和平台支付金额不一致"),
 
     ;
     private final int code;

performance-api/src/main/java/com/clx/performance/enums/RunningWaterTypeEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("all")
+public enum RunningWaterTypeEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        TOP_UP(10, "充值"),
+        FROZEN(20, "冻结"),
+        THAW(30, "解冻"),
+        TAKE_OUT(40, "扣除"),
+        CASE_OUT_FROZEN(50, "提现冻结"),
+        CASE_OUT_SUCCESS(60, "提现成功"),
+        CASE_OUT_FAIL(70, "提现失败")
+        ;
+        private final Integer code;
+        private final String msg;
+
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/TruckDemandEnum.java

@@ -6,9 +6,6 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-@Getter
-@AllArgsConstructor
-@SuppressWarnings("all")
 public enum TruckDemandEnum {
     ;
     @Getter

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementDriverEnum.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 SettlementDriverEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceType {
+        ONLINE(1, "网运单"),
+        ORDINARY(2, "普通单");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceType> 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(InvoiceType::getMsg).orElse(null);
+        }
+    }
+
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        WAIT_SETTLEMENT(1, "待结算"),
+        SETTLED(2, "已结算"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> 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(Status::getMsg).orElse(null);
+        }
+    }
+
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementLogEnum.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 SettlementLogEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        CREATE_SETTLEMENT(1, "创建结算单"),
+        UPLOAD_SETTLEMENT (2, "上传结算凭证"),
+        OWNER_TO_BE_CONFIRMED(3, "货主确认结算单"),
+        SHIPPER_TO_PAYMENT(4, "货主付款"),
+        PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "平台确认付款"),
+        PLATFORM_TO_PAYMENT(6, "平台付款"),
+        OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认付款"),
+        INVOICE_TO_BE_MAILED(8, "邮寄发票"),
+        COMPLETED(9, "已完结"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> 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(Type::getMsg).orElse(null);
+        }
+    }
+
+
+
+}

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, "是"),
+        NO_INVOICE(2,"无需开票"),
+        ;
+        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/enums/settle/SettlementOwnerEnum.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 SettlementOwnerEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceType {
+        ONLINE(1, "网运单"),
+        ORDINARY(2, "普通单");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceType> 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(InvoiceType::getMsg).orElse(null);
+        }
+    }
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceStatus {
+        All_INVOICED(1, "已开票"),
+        PARTIAL_INVOICED(2, "部分开票"),
+        NO_NEED_INVOICE(3, "无需开票");
+        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 Status {
+        TO_BE_LOCKED(10, "待锁定"),
+        TO_BE_ACCOUNT(20, "待对账"),
+        OWNER_TO_BE_CONFIRMED(30, "待货主确认"),
+        SHIPPER_TO_PAYMENT (40, "待货主付款"),
+        PLATFORM_CONFIRMED_OWNER_PAYMENT(50, "待平台确认付款"),
+        PLATFORM_TO_PAYMENT(60, "待平台付款"),
+        OWNER_CONFIRMED_PLATFORM_PAYMENT(70, "待货主确认付款"),
+        INVOICE_TO_BE_MAILED(80, "待邮寄发票"),
+        COMPLETED(90, "已完结"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> 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(Status::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum MergeStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<MergeStatus> 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(MergeStatus::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SettlementPeriodType {
+
+        IMMEDIATE(1, "拉运完成结算"),
+        MONTH(2, "月结"),
+
+        ;
+
+        private final int code;
+        private final String name;
+
+        public static Optional<SettlementPeriodType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementPlatformEnum.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 SettlementPlatformEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Platform {
+        MSL(1, "马上来"),
+        WY(2, "网运平台");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Platform> 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(Platform::getMsg).orElse(null);
+        }
+    }
+
+
+
+
+
+}

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -2,6 +2,9 @@ package com.clx.performance.feign;
 
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.owner.FrozenAccountParam;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -70,4 +73,12 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/breakContract/saveSettlementOwnerForTonnageDown"})
     Result saveSettlementOwnerForTonnageDown(@RequestBody OrderAdjustTonnageDownParam param);
 
+    @PostMapping(value = {"clx-performance/feign/owner/ownerAccountFrozen"})
+    Result<Object> ownerAccountFrozen(@RequestBody FrozenAccountParam param);
+
+    @PostMapping(value = {"clx-performance/feign/owner/ownerAccountThaw"})
+    Result<Object> ownerAccountThaw(@RequestBody ThawAccountParam param);
+
+    @PostMapping(value = {"clx-performance/pc/carrier/settlementOwner/updateStatusByOrderNo"})
+    Result<Object> updateStatusByOrderNo(@RequestBody UpdateStatusParam param);
 }

performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerBindCardParam.java

+package com.clx.performance.param.open;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(description = "货主绑卡")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOwnerBindCardParam {
+
+    @ApiModelProperty(value = "货主编号")
+    private Long userNo;
+
+    @ApiModelProperty(value = "货主姓名")
+    private String name;
+
+    @ApiModelProperty(value = "所属银行")
+    private String ownerAccountBank;
+
+    @ApiModelProperty(value = "开户行")
+    private String ownerOpenBank;
+
+    @ApiModelProperty(value = "户名")
+    private String ownerAccountName;
+
+    @ApiModelProperty(value = "银行账户")
+    private String ownerBankAccount;
+}

performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerCaseOutParam.java

+package com.clx.performance.param.open;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@ApiModel(description = "货主提现")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOwnerCaseOutParam {
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "提现金额（元）", example = "1.23")
+    @MoneyInConvert
+    private BigDecimal caseOutBalance;
+
+    @ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "提现银行", example = "浙江银行")
+    private String caseOutBank;
+
+    @ApiModelProperty(value = "提现银行卡号", example = "62213545878787")
+    private String caseOutBankNumber;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerTopUpParam.java

+package com.clx.performance.param.open;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@ApiModel(description = "货主充值")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOwnerTopUpParam {
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "充值金额（元）", example = "1.23")
+    @MoneyInConvert
+    private BigDecimal topUpBalance;
+
+    @ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "打款银行", example = "浙江银行")
+    private String drawingBank;
+
+    @ApiModelProperty(value = "打款银行卡号", example = "62213545878787")
+    private String drawingBankNumber;
+
+    @ApiModelProperty(value = "打款凭证", example = "/a.png")
+    private String drawingProof;
+
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsChildParams.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.convertor.type.MoneyInConvert;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/order/params/OrderGoodsParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsParams.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.convertor.field.Converted;
 import io.swagger.annotations.ApiModelProperty;

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(description = "货主绑卡")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerBindCardParam {
+
+    @ApiModelProperty(value = "所属银行")
+    private String ownerAccountBank;
+
+    @ApiModelProperty(value = "开户行")
+    private String ownerOpenBank;
+
+    @ApiModelProperty(value = "户名")
+    private String ownerAccountName;
+
+    @ApiModelProperty(value = "银行账户")
+    private String ownerBankAccount;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+@ApiModel(description = "提现审批")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerCaseOutApproveParam {
+
+    @ApiModelProperty(value = "id", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "平台付款银行")
+    private String platformPaymentBank;
+
+    @ApiModelProperty(value = "平台付款银行账号")
+    private String platformPaymentBankNumber;
+
+    @ApiModelProperty(value = "付款凭证", example = "a.png")
+    private String paymentProof;
+
+    @ApiModelProperty(value = "平台付款金额", example = "11.21")
+    @MoneyInConvert
+    private BigDecimal platformPayBalance;
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@ApiModel(description = "货主提现")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerCaseOutParam {
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "提现金额（元）", example = "1.23")
+    @MoneyInConvert
+    private BigDecimal caseOutBalance;
+
+    @ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "提现银行", example = "浙江银行")
+    private String ownerOpenBank;
+
+    @ApiModelProperty(value = "提现银行卡号", example = "62213545878787")
+    private String ownerBankAccount;
+
+}
\ No newline at end of file

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@ApiModel(description = "货主充值")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerTopUpParam {
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "充值金额（元）", example = "1.23")
+    @MoneyInConvert
+    private BigDecimal topUpBalance;
+
+    @ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "打款银行", example = "浙江银行")
+    private String drawingBank;
+
+    @ApiModelProperty(value = "打款银行卡号", example = "62213545878787")
+    private String drawingBankNumber;
+
+    @ApiModelProperty(value = "打款凭证", example = "/a.png")
+    private String drawingProof;
+
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/order/params/PageCarrierOrderListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderListParam.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/order/params/PageOrderGoodsListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOrderGoodsListParam.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageOwnerAccountListParam extends PageParam {
+
+    @ApiModelProperty(value = "货主编码")
+    private String ownerUserNo;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "账户类型 1：保证金 2：预付运费")
+    private Integer accountType;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageOwnerAccountRunningWaterParam extends PageParam {
+
+    @ApiModelProperty(value="账户类型",example = "1：保证金账户 2：预付金账户")
+    private String accountType;
+
+    @ApiModelProperty(value="流水类型 10:充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
+    private String runningWaterType;
+
+    @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+    @ApiModelProperty(value="货主编码",example = "20145787812312312")
+    private Long ownerUserNo;
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageOwnerBindCardRecordListParam extends PageParam {
+
+    @ApiModelProperty(value = "货主用户编码")
+    private Long ownerUserNo;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageOwnerCaseOutListParam extends PageParam {
+
+    @ApiModelProperty(value = "开始时间", example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "2020-01-01 10:10:10")
+    private String endTime;
+
+    @ApiModelProperty(value = "充值账户类型 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "货主用户编码")
+    private Long userNo;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageOwnerTopUpListParam extends PageParam {
+
+    @ApiModelProperty(value = "开始时间", example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "2020-01-01 10:10:10")
+    private String endTime;
+
+    @ApiModelProperty(value = "充值账户类型 1：保证金 2：预付运费", example = "1")
+    private Integer accountType;
+
+    @ApiModelProperty(value = "货主用户编码")
+    private Long ownerUserNo;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PagePlatformMarginAccountParam extends PageParam {
+
+    @ApiModelProperty(value="货主编码",example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="流水编号",example = "201457878")
+    private String runningWaterNo;
+
+    @ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
+    private Integer runningWaterType;
+
+    @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PagePlatformPrepaidFreightAccountParam extends PageParam {
+
+    @ApiModelProperty(value="货主编码",example = "20145787812312312")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String orderChildNo;
+
+    @ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
+    private Integer runningWaterType;
+
+    @ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author huyufan
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PlatformAccountTopUpParam{
+
+    @ApiModelProperty(value="id",example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value="账户类型",example = "1：保证金 2：预付运费")
+    private Integer accountType;
+
+    @ApiModelProperty(value="审批拒绝原因")
+    private String turnDownContent;
+
+    @ApiModelProperty(value="是否通过 1:通过 0:拒绝",example = "true")
+    private Boolean passType;
+
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.clx.performance.param.app.PositionParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class SettlementInvoiceExpressParam extends PositionParam {
+
+    @ApiModelProperty(value = "结算id", example = "1")
+    @NotNull(message = "结算id不能为空")
+    private Integer settlementId;
+
+    @ApiModelProperty(value = "快递公司", example = "顺丰")
+    @NotBlank(message = "快递公司不能为空")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "1000000")
+    @NotBlank(message = "快递编号不能为空")
+    private String expressNo;
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.clx.performance.param.app.PositionParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class SettlementInvoiceImageUpdateParam extends PositionParam {
+
+    @ApiModelProperty(value = "结算id", example = "1")
+    @NotNull(message = "结算id不能为空")
+    private Integer settlementId;
+
+    @ApiModelProperty(value = "结算凭证", example = "url")
+    @NotBlank(message = "结算凭证不能为空")
+    private String invoiceImg;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverDetailParam.java

+package com.clx.performance.param.pc.driver;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+public class PageCarrierSettlementDriverDetailParam extends PageParam {
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="车主编码",example = "201457878")
+    private Long driverUserNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverParam.java

+package com.clx.performance.param.pc.driver;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCarrierSettlementDriverParam extends PageParam {
+
+    @ApiModelProperty(value="货单编号",example = "201457878")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="车主编码",example = "201457878")
+    private Long driverUserNo;
+
+    @ApiModelProperty(value="状态 1:待结算  2:已结算",example = "10")
+    private String status;
+
+
+
+
+
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class CreteAccountParam {
+
+    private Long userNo;
+
+    private String name;
+
+    private String mobile;
+}

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

+package com.clx.performance.param.pc.owner;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class FrozenAccountParam {
+
+    private Long userNo;
+
+    //预付运费
+    private BigDecimal frozenBalance;
+    //保证金
+    private BigDecimal ensureBalance;
+    private Integer orderId;
+    private String orderNo;
+}

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

+package com.clx.performance.param.pc.owner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author liruixin
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class OwnerConfirmSettlementParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value="列表id",example = "10")
+    private Integer id;
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+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;
+
+/**
+ * @Author liruixin
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class OwnerPaymentSettlementParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value="列表id",example = "10")
+    private Integer id;
+
+    @NotBlank(message = "收款人不能为空")
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @NotBlank(message = "收款银行不能为空")
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @NotBlank(message = "收款银行卡卡号不能为空")
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @NotBlank(message = "付款银行不能为空")
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @NotBlank(message = "付款银行卡卡号不能为空")
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
+
+    @NotBlank(message = "付款凭证不能为空")
+    @ApiModelProperty(value = "付款凭证", example = "/a.png")
+    private String paymentImg;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerDetailParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCarrierSettlementOwnerDetailParam extends PageParam {
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="货主编码",example = "201457878")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName PageCarrierSettlementOwnerParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/17 13:25
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class PageCarrierSettlementOwnerParam extends PageParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="货主编码",example = "201457878")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结",example = "10")
+    private String status;
+}

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-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName PageOwnerSettlementParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/17 15:46
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class PageOwnerSettlementParam extends PageParam {
+
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+}

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

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SaveExpressParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "快递公司", example = "顺风")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "SF145787")
+    private String expressNo;
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SavePayeeParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @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 = "123")
+    private String paymentAmount;
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class ThawAccountParam {
+
+    private String orderNo;
+
+    // 1: 普通单  2：网运单
+    private String orderType;
+}

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

+package com.clx.performance.param.pc.owner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateStatusParam {
+
+    @ApiModelProperty(value = "订单编号", example = "PT2023102400420")
+    private String orderNo;
+
+    @ApiModelProperty(value = "结算类型：1拉运完成结 2月结", example = "1")
+    private Integer settlementPeriodType;
+
+    @ApiModelProperty(value = "当前状态 10 待锁定,20 待对账,30 待货主确认,40 待货主付款,50 待平台确认付款,60 待平台付款,70 待货主确认付款,80 待邮寄发票,90 已完结", example = "10")
+    private Integer fromStatus;
+
+    @ApiModelProperty(value = "目标状态 10 待锁定,20 待对账,30 待货主确认,40 待货主付款,50 待平台确认付款,60 待平台付款,70 待货主确认付款,80 待邮寄发票,90 已完结", example = "20")
+    private Integer toStatus;
+
+
+
+
+}

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

+package com.clx.performance.param.pc.owner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UploadInvoiceImgParam{
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="结算凭证",example = "/123.img")
+    private String invoiceImg;
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildFreightInfoVO.java

@@ -49,7 +49,15 @@ public class OrderChildFreightInfoVO {
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal totalFreight = freightPrice.multiply(weight);
+        if (unloadNet != null){
+            totalFreight = freightPrice.multiply(unloadNet.compareTo(loadNet) < 0? unloadNet : loadNet);
+            BigDecimal dif = unloadNet.subtract(weight);
+            if (dif.compareTo(BigDecimal.ZERO) < 0){
+                totalFreight = totalFreight.add(lossPrice.multiply(dif));
+            }
+        }
+        return totalFreight.setScale(2, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -63,6 +63,8 @@ public class OrderChildVO {
 
     @ApiModelProperty(value = "车主id", example = "1")
     private Long truckOwnUserNo;
+    @ApiModelProperty(value = "车主姓名", example = "李四")
+    private String truckOwnName;
     @ApiModelProperty(value = "车辆ID", example = "1")
     private Integer truckId;
     @ApiModelProperty(value = "车牌号", example = "京A12345")

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildAddMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OrderChildAddMqParam {
+
+    private String childNo;        //运单编号
+
+}

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildDriverConfirmMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 司机确认收货
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OrderChildDriverConfirmMqParam {
+
+    private String childNo;        //运单编号
+
+}

performance-api/src/main/java/com/clx/performance/vo/mq/SettlementDetailAddMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 新增计费明细
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class SettlementDetailAddMqParam {
+
+    private Integer settlementOwnerDetailId;        //货主计费明细id
+    private Integer settlementDriverDetailId;       //司机计费明细id
+
+}

performance-api/src/main/java/com/clx/performance/vo/mq/SettlementDetailInvoiceTypeSyncMqParam.java

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 开票标识同步
+ * @Date: 2023-10-19 15:45:25
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class SettlementDetailInvoiceTypeSyncMqParam {
+
+    private String childNo;             //运单编号
+    private Integer InvoiceType;        //司机计费明细id
+
+}

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OwnerAccountRunningWaterRecordVO {
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("流水号")
+    private Long runningWaterNo;
+    /**
+     * 货主编码
+     */
+    @ApiModelProperty("货主编码")
+    private Long ownerUserNo;
+    /**
+     * 货主名称
+     */
+    @ApiModelProperty("货主名称")
+    private String ownerUserName;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+     * 账户类型
+     */
+    @ApiModelProperty("账户类型")
+    private Integer accountType;
+
+    /**
+     * 关联数据主键ID
+     */
+    @ApiModelProperty("关联数据主键ID")
+    private Integer relationId;
+    /**
+     * 流水类型
+     */
+    @ApiModelProperty("流水类型 10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败")
+    private Integer runningWaterType;
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private Integer orderId;
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    /**
+     * 运单ID
+     */
+    @ApiModelProperty("运单ID")
+    private Integer orderChildId;
+    /**
+     * 运单编号
+     */
+    @ApiModelProperty("运单编号")
+    private String orderChildNo;
+    /**
+     * 变动金额
+     */
+    @ApiModelProperty("变动金额")
+    @MoneyOutConvert
+    private BigDecimal alterationBalance;
+    /**
+     * 冻结金额
+     */
+    @ApiModelProperty("冻结金额")
+    @MoneyOutConvert
+    private BigDecimal frozenBalance;
+    /**
+     * 可用余额
+     */
+    @ApiModelProperty("可用余额")
+    @MoneyOutConvert
+    private BigDecimal usableBalance;
+    /**
+     * 账户余额
+     */
+    @ApiModelProperty("账户余额")
+    @MoneyOutConvert
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("扣除金额")
+    @MoneyOutConvert
+    private BigDecimal takeOutBalance;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty("操作人")
+    private String createBy;
+    /**
+     * 操作时间
+     */
+    @ApiModelProperty("操作时间")
+    private String createTime;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OwnerAccountVO {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 货主编码
+     */
+    @ApiModelProperty(value = "货主编码")
+    private String ownerUserNo;
+    /**
+     * 货主名称
+     */
+    @ApiModelProperty(value = "货主名称")
+    private String ownerUserName;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    /**
+     * 账户类型;1:保证金 2：预付运费
+     */
+    @ApiModelProperty(value = "账户类型;1:保证金 2：预付运费")
+    private Integer accountType;
+    /**
+     * 账户余额
+     */
+    @ApiModelProperty(value = "账户余额")
+    @MoneyOutConvert
+    private BigDecimal accountBalance;
+    /**
+     * 可用余额
+     */
+    @ApiModelProperty(value = "可用余额")
+    @MoneyOutConvert
+    private BigDecimal usableBalance;
+    /**
+     * 冻结金额
+     */
+    @ApiModelProperty(value = "冻结金额")
+    @MoneyOutConvert
+    private BigDecimal frozenBalance;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private String modifiedTime;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * 货主绑卡记录;
+ *
+ * @date : 2023-10-12
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class OwnerBindCardRecordVO{
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 货主编码
+     */
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;
+//    /**
+//     * 货主名称
+//     */
+//    @ApiModelProperty(value = "货主名称")
+//    private String ownerUserName;
+//    /**
+//     * 货主类型;1:企业 2：个人
+//     */
+//    @ApiModelProperty(value = "货主类型;1:企业 2：个人")
+//    private Integer ownerType;
+//    /**
+//     * 货主银行
+//     */
+//    @ApiModelProperty(value = "货主银行")
+//    private String ownerBank;
+//    /**
+//     * 银行卡号
+//     */
+//    @ApiModelProperty(value = "银行卡号")
+//    private String bankCardNumber;
+//    /**
+//     * 开户行
+//     */
+//    @ApiModelProperty(value = "开户行")
+//    private String openAccountBank;
+//    /**
+//     * 户名
+//     */
+//    @ApiModelProperty(value = "户名")
+//    private String accountBankName;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value = "操作人")
+    private String createBy;
+    /**
+     * 操作项目
+     */
+    @ApiModelProperty(value = "操作项目")
+    private String createItem;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 货主提现;
+ *
+ * @date : 2023-10-12
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OwnerCaseOutVO {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 货主编号
+     */
+    @ApiModelProperty(value = "货主编号")
+    private Long ownerUserNo;
+
+    /**
+     * 提现编号
+     */
+    @ApiModelProperty(value = "提现编号")
+    private Long caseOutNo;
+    /**
+     * 提现账户类型
+     */
+    @ApiModelProperty(value = "提现账户类型 1 ：保证金 2：预付运费")
+    private Integer accountType;
+    /**
+     * 提现金额
+     */
+    @ApiModelProperty(value = "提现金额")
+    @MoneyOutConvert
+    private BigDecimal caseOutBalance;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态 10：代付款 20：待货主确认 30：已付款")
+    private Integer status;
+    /**
+     * 提现银行
+     */
+    @ApiModelProperty(value = "提现银行")
+    private String caseOutBank;
+    /**
+     * 提现银行卡号
+     */
+    @ApiModelProperty(value = "提现银行卡号")
+    private String caseOutBankNumber;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value = "操作人")
+    private String createBy;
+    /**
+     * 付款时间
+     */
+    @ApiModelProperty(value = "付款时间")
+    private String paymentTime;
+    /**
+     * 平台付款银行
+     */
+    @ApiModelProperty(value = "平台付款银行")
+    private String platformPaymentBank;
+    /**
+     * 平台付款银行账号
+     */
+    @ApiModelProperty(value = "平台付款银行账号")
+    private String platformPaymentBankNumber;
+    /**
+     * 付款人
+     */
+    @ApiModelProperty(value = "付款人")
+    private String paymentBy;
+    /**
+     * 付款凭证
+     */
+    @ApiModelProperty(value = "付款凭证")
+    private String paymentProof;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "操作时间")
+    private String createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private String modifiedTime;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 货主充值
+ *
+ * @date : 2023-10-12
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OwnerTopUpVO {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 充值编号
+     */
+    @ApiModelProperty(value = "充值编号")
+    private Long topUpNo;
+    /**
+     * 货主编码
+     */
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;
+    /**
+     * 充值类型
+     */
+    @ApiModelProperty(value = "充值类型  1:保证金 2：预付运费")
+    private Integer accountType;
+    /**
+     * 充值金额
+     */
+    @ApiModelProperty(value = "充值金额")
+    @MoneyOutConvert
+    private BigDecimal topUpBalance;
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态 10：待审批 20：审批拒绝 30：审批通过")
+    private Integer status;
+    /**
+     * 打款银行
+     */
+    @ApiModelProperty(value = "打款银行")
+    private String drawingBank;
+    /**
+     * 打款银行卡号
+     */
+    @ApiModelProperty(value = "打款银行卡号")
+    private String drawingBankNumber;
+    /**
+     * 打款凭证
+     */
+    @ApiModelProperty(value = "打款凭证")
+    private String drawingProof;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value = "操作人")
+    private String createBy;
+    /**
+     * 审批时间
+     */
+    @ApiModelProperty(value = "审批时间")
+    private String approvalTime;
+    /**
+     * 审批人
+     */
+    @ApiModelProperty(value = "审批人")
+    private String approvalBy;
+    /**
+     * 审批拒绝
+     */
+    @ApiModelProperty(value = "审批拒绝")
+    private String approvalTurnDown;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CarrierPageSettlementDriverDetailVO {
+
+    @ApiModelProperty(value = "计费明细ID")
+    private Integer id;
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+    @ApiModelProperty(value = "货单编号")
+    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "车主编码")
+    private Long driverUserNo;
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+    @ApiModelProperty(value = "货物id")
+    private Integer goodsId;
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;
+    @ApiModelProperty(value = "车牌号")
+    private String truckNo;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;                      
+    @MoneyOutConvert
+    @ApiModelProperty(value = "运费单价")
+    private BigDecimal freightPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损单价")
+    private BigDecimal lossPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CarrierPageSettlementDriverVO {
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+    @ApiModelProperty(value = "货单编号")
+    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "车主编码")
+    private Long driverUserNo;
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+    @ApiModelProperty(value = "货物id")
+    private Integer goodsId;
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;
+    @ApiModelProperty(value = "车牌号")
+    private String truckNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "运费单价")
+    private BigDecimal freightPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损单价")
+    private BigDecimal lossPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    @ApiModelProperty(value = "结算平台 1：马上来  2：网运平台")
+    private String settlementPlatform;
+
+
+
+
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CarrierPageSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value = "计费明细ID")
+    private Integer id;                             
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;                       
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerName;                       
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;                         
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "发货地址id", example = "")
+    private Integer sendAddressId;
+    @ApiModelProperty(value = "发货地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址id", example = "")
+    private Integer receiveAddressId;
+    @ApiModelProperty(value = "收货地址", example = "")
+    private String receiveAddress;
+    @ApiModelProperty(value = "货物id")
+    private Integer goodsId;                        
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;                       
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;                      
+    @MoneyOutConvert
+    @ApiModelProperty(value = "平台运费报价")
+    private BigDecimal freightPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损单价")
+    private BigDecimal lossPrice;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;              
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class CarrierPageSettlementOwnerVO {
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerName;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")
+    private Integer status;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerCompanyContactVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerCompanyContactVO {
+
+    @ApiModelProperty(value = "公司联系人", example = "1.23")
+    private String companyContact;
+
+    @ApiModelProperty(value = "公司联系电话", example = "公司联系人")
+    private String companyContactMobile;
+
+    @ApiModelProperty(value = "公司联系地址", example = "公司联系地址")
+    private String companyContactAddress;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerCompanyVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerCompanyVO {
+
+    @ApiModelProperty(value = "公司名称", example = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "企业税号", example = "企业税号")
+    private String companyTaxCode;
+
+    @ApiModelProperty(value = "公司地址", example = "公司地址")
+    private String companyAddress;
+
+    @ApiModelProperty(value = "公司电话", example = "1222222222")
+    private String companyMobile;
+
+    @ApiModelProperty(value = "公司开户行", example = "中国银行")
+    private String companyBankName;
+
+    @ApiModelProperty(value = "公司银行账号", example = "6215454545")
+    private String companyBankNo;
+
+}

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

+package com.clx.performance.vo.pc.carrier.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value = "id", example = "1.23")
+    private Integer id;
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "货主名称", example = "货主")
+    private String ownerName;
+
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "结算子单号", example = "JS012")
+    private String settlementSubNo;
+
+    @ApiModelProperty(value = "结算周期类型：1拉运完成结 2月结", example = "")
+    private Integer settlementPeriodType;
+    @ApiModelProperty(value = "结算周期时间（月结）", example = "")
+    private String settlementPeriodTime;
+
+    @ApiModelProperty(value = "订单编号", example = "123")
+    private String orderNo;
+
+    @ApiModelProperty(value = "实际净重（吨）", example = "1.23")
+    private BigDecimal weight;
+
+    @ApiModelProperty(value = "实际运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freight;
+
+    @ApiModelProperty(value = "货损吨数（吨）", example = "1.23")
+    private BigDecimal lossWeight;
+
+    @ApiModelProperty(value = "货损金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossFreight;
+
+    @ApiModelProperty(value = "预付运费金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal prepayFreight;
+
+    @ApiModelProperty(value = "结算金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal settlementFreight;
+
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
+    private Integer invoiceTypeCode;
+
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "网运单")
+    private String invoiceTypeMsg;
+
+    @ApiModelProperty(value = "开票金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value = "结算凭证", example = "/a.png")
+    private String invoiceImg;
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @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;
+
+    @ApiModelProperty(value = "企业税号", example = "企业税号")
+    private String companyTaxCode;
+
+    @ApiModelProperty(value = "公司地址", example = "公司地址")
+    private String companyAddress;
+
+    @ApiModelProperty(value = "公司电话", example = "1222222222")
+    private String companyMobile;
+
+    @ApiModelProperty(value = "公司开户行", example = "中国银行")
+    private String companyBankName;
+
+    @ApiModelProperty(value = "公司银行账号", example = "6215454545")
+    private String companyBankNo;
+
+    @ApiModelProperty(value = "公司联系人", example = "1.23")
+    private String companyContact;
+
+    @ApiModelProperty(value = "公司联系电话", example = "公司联系人")
+    private String companyContactMobile;
+
+    @ApiModelProperty(value = "公司联系地址", example = "公司联系地址")
+    private String companyContactAddress;
+
+    @ApiModelProperty(value = "快递公司", example = "顺风")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "SF145787")
+    private String expressNo;
+
+    @ApiModelProperty(value = "开票状态code 1-已开票 2-部分开票 3-无需开票", example = "1")
+    private Integer invoiceStatusCode;
+
+    @ApiModelProperty(value = "开票状态Msg 1-已开票 2-部分开票 3-无需开票", example = "无需开票")
+    private String invoiceStatusMsg;
+
+    @ApiModelProperty(value = "状态code 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结", example = "10")
+    private Integer statusCode;
+
+    @ApiModelProperty(value = "状态Msg", example = "待锁定")
+    private String statusMsg;
+
+    @ApiModelProperty(value = "驳回原因", example = "驳回原因")
+    private String remark;
+
+    @ApiModelProperty(value = "创建时间", example = "2023-01-01 00:00:00")
+    private String createTime;
+
+    @ApiModelProperty(value = "结算单合并明细")
+    private List<SettlementMergeVO> mergers;
+
+    @ApiModelProperty(value = "结算单操作日志")
+    private List<SettlementLogVO> settlementLogs;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerExpressVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerExpressVO {
+
+    @ApiModelProperty(value = "快递公司", example = "顺风")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "SF145787")
+    private String expressNo;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerPayeeVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerPayeeVO {
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementLogVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class SettlementLogVO  {
+
+    @ApiModelProperty(value = "类型", example = "9")
+    private Integer type;
+
+    @ApiModelProperty(value = "内容", example = "已完结")
+    private String remark;
+
+    @ApiModelProperty(value = "操作人名称", example = "小李")
+    private String createName;
+
+    @ApiModelProperty(value = "创建时间", example = "2023-01-01 00:00:00")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementMergeVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class SettlementMergeVO {
+
+
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "结算子单号", example = "JS012")
+    private String settlementSubNo;
+
+    @ApiModelProperty(value = "操作人", example = "李四")
+    private String mergedBy;
+
+    @ApiModelProperty(value = "合并时间", example = "2023-01-01 00:00:00")
+    private String mergeTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/OwnerPageSettlementOwnerVO.java

+package com.clx.performance.vo.pc.owner.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName CarrierPageSettlementOwnerDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/16 15:01
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class OwnerPageSettlementOwnerVO {
+    @ApiModelProperty(value = "结算单Id")
+    private Integer id;
+    @ApiModelProperty(value = "结算单号")
+    private String settlementNo;
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+    @ApiModelProperty(value = "货主编码")
+    private Long ownerUserNo;
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerName;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "实际净重（吨）")
+    private BigDecimal weight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "实际运费金额")
+    private BigDecimal freight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "预付运费金额")
+    private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "货损吨数（吨）")
+    private BigDecimal lossWeight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "货损金额")
+    private BigDecimal lossFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "结算金额")
+    private BigDecimal settlementFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票金额")
+    private BigDecimal invoiceFreight;
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+    @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")
+    private Integer status;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

+package com.clx.performance.vo.pc.owner.settle;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageOwnerSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value="货主用户编号",example = "4174174")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value="货主名称",example = "张三")
+    private String ownerName;
+
+    @ApiModelProperty(value="结算单号",example = "41441")
+    private String settlementNo;
+
+    @ApiModelProperty(value="结算子单号",example = "41441")
+    private String settlementSubNo;
+
+    @ApiModelProperty(value="运单编号",example = "41441")
+    private String childNo;
+
+
+    @ApiModelProperty(value="订单编号",example = "41441")
+    private String orderNo;
+
+
+    @ApiModelProperty(value="货物名称",example = "货物名称")
+    private String goodsName;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="平台运费单价",example = "10.2")
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value="实际净重（吨）",example = "2.3")
+    private BigDecimal weight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="实际运费",example = "2.52")
+    private BigDecimal freight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="损耗单价",example = "1.2")
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value="货损吨数（吨）",example = "1.02")
+    private BigDecimal lossWeight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="货损金额",example = "2.3")
+    private BigDecimal lossFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="预付运费金额",example = "1.2")
+    private BigDecimal prepayFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="结算金额",example = "1.2")
+    private BigDecimal settlementFreight;
+
+    @MoneyOutConvert
+    @ApiModelProperty(value="开票金额",example = "2.1")
+    private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "普通单")
+    private String invoiceTypeMsg;
+
+    @ApiModelProperty(value="尾款状态 0-否,1-是,2-无需支付",example = "无需支付")
+    private String finalPaymentStatusMsg;
+
+    @ApiModelProperty(value="开票状态 0-否,1-是",example = "是")
+    private String invoiceStatusMsg;
+
+    @ApiModelProperty(value="创建时间",example = "2013-01-01 00:00:00")
+    private String createTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/SettlementPlatformAccountVO.java

+package com.clx.performance.vo.pc.owner.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class SettlementPlatformAccountVO {
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
+
+}
\ No newline at end of file

performance-web/pom.xml

@@ -45,6 +45,12 @@
             <artifactId>user-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.clx.cy</groupId>
+            <artifactId>open-sdk</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.msl</groupId>
             <artifactId>user-sdk</artifactId>

performance-web/src/main/java/com/clx/performance/config/MslAppConfig.java

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+@Getter
+@Setter
+public class MslAppConfig {
+
+    @Value("${msl.supervise.trade.appid}")
+    private String appId;
+    @Value("${msl.supervise.trade.url}")
+    private String url;
+    @Value("${msl.supervise.trade.secret}")
+    private String secret;
+}

performance-web/src/main/java/com/clx/performance/config/RabbitOrderChildConfig.java

+package com.clx.performance.config;
+
+import com.clx.performance.constant.RabbitKeyOrderChildConstants;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 运单 MQ
+ * @Date: 2023-10-12 16:27:30
+ * @Version: 1.0
+ */
+@Configuration
+public class RabbitOrderChildConfig {
+
+    @Bean
+    public DirectExchange orderChildDefaultExchange() {
+        return new DirectExchange(RabbitKeyOrderChildConstants.DEFAULT_EXCHANGE);
+    }
+
+    @Bean
+    public Queue orderChildDefaultDelayQueue() {
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("x-message-ttl", 15 * 60 * 1000);
+        params.put("x-max-length", 5000000);
+        params.put("x-dead-letter-exchange", RabbitKeyOrderChildConstants.DEFAULT_EXCHANGE);
+        params.put("x-dead-letter-routing-key", RabbitKeyOrderChildConstants.DEFAULT_DEAD_ROUTING_KEY);
+        return new Queue(RabbitKeyOrderChildConstants.DEFAULT_DELAY_QUEUE, true, false, false, params);
+    }
+    @Bean
+    public Binding orderChildDefaultDelayQueueBinding() {
+        return BindingBuilder.bind(orderChildDefaultDelayQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.DEFAULT_DELAY_ROUTING_KEY);
+    }
+
+    @Bean
+    public Queue orderChildDefaultDeadQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.DEFAULT_DEAD_QUEUE);
+    }
+    @Bean
+    public Binding orderChildDefaultDeadQueueBinding() {
+        return BindingBuilder.bind(orderChildDefaultDeadQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.DEFAULT_DEAD_ROUTING_KEY);
+    }
+
+
+    /**
+     * 新增
+     */
+    @Bean
+    public Queue orderChildAddQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_ADD_QUEUE);
+    }
+    @Bean
+    public Binding orderChildAddQueueBinding() {
+        return BindingBuilder.bind(orderChildAddQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_ADD_ROUTING_KEY);
+    }
+
+    /**
+     * 司机确认收货
+     */
+    @Bean
+    public Queue orderChildDriverConfirmQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_DRIVER_CONFIRM_QUEUE);
+    }
+    @Bean
+    public Binding orderChildDriverConfirmQueueBinding() {
+        return BindingBuilder.bind(orderChildDriverConfirmQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_DRIVER_CONFIRM_ROUTING_KEY);
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/config/RabbitSettlementConfig.java

+package com.clx.performance.config;
+
+import com.clx.performance.constant.RabbitKeySettlementConstants;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 司机积分 MQ
+ * @Date: 2023-10-12 16:27:30
+ * @Version: 1.0
+ */
+@Configuration
+public class RabbitSettlementConfig {
+
+    @Bean
+    public DirectExchange settlementDefaultExchange() {
+        return new DirectExchange(RabbitKeySettlementConstants.DEFAULT_EXCHANGE);
+    }
+
+    @Bean
+    public Queue settlementDefaultDelayQueue() {
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("x-message-ttl", 15 * 60 * 1000);
+        params.put("x-max-length", 5000000);
+        params.put("x-dead-letter-exchange", RabbitKeySettlementConstants.DEFAULT_EXCHANGE);
+        params.put("x-dead-letter-routing-key", RabbitKeySettlementConstants.DEFAULT_DEAD_ROUTING_KEY);
+        return new Queue(RabbitKeySettlementConstants.DEFAULT_DELAY_QUEUE, true, false, false, params);
+    }
+    @Bean
+    public Binding settlementDefaultDelayQueueBinding() {
+        return BindingBuilder.bind(settlementDefaultDelayQueue()).to(settlementDefaultExchange()).with(RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY);
+    }
+
+    @Bean
+    public Queue settlementDefaultDeadQueue() {
+        return new Queue(RabbitKeySettlementConstants.DEFAULT_DEAD_QUEUE);
+    }
+    @Bean
+    public Binding settlementDefaultDeadQueueBinding() {
+        return BindingBuilder.bind(settlementDefaultDeadQueue()).to(settlementDefaultExchange()).with(RabbitKeySettlementConstants.DEFAULT_DEAD_ROUTING_KEY);
+    }
+
+
+    /**
+     * 计费明细新增
+     */
+    @Bean
+    public Queue settlementDetailAddQueue() {
+        return new Queue(RabbitKeySettlementConstants.SETTLEMENT_DETAIL_ADD_QUEUE);
+    }
+    @Bean
+    public Binding settlementDetailAddQueueBinding() {
+        return BindingBuilder.bind(settlementDetailAddQueue()).to(settlementDefaultExchange()).with(RabbitKeySettlementConstants.SETTLEMENT_DETAIL_ADD_ROUTING_KEY);
+    }
+
+    /**
+     * 计费明细新增
+     */
+    @Bean
+    public Queue settlementDetailInvoiceTypeSyncQueue() {
+        return new Queue(RabbitKeySettlementConstants.SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_QUEUE);
+    }
+    @Bean
+    public Binding settlementDetailInvoiceTypeSyncQueueBinding() {
+        return BindingBuilder.bind(settlementDetailInvoiceTypeSyncQueue()).to(settlementDefaultExchange()).with(RabbitKeySettlementConstants.SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_ROUTING_KEY);
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyOrderChildConstants.java

+package com.clx.performance.constant;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 结算-mq
+ * @Date: 2023-10-19 15:10:10
+ * @Version: 1.0
+ */
+public class RabbitKeyOrderChildConstants {
+
+    private static final String PREFIX = "clx-performance.orderChild.";
+    private static final String EXCHANGE = ".exchange";
+    private static final String QUEUE = ".queue";
+    private static final String QUEUE_ROUTING_KEY = ".routing.key";
+    private static final String DELAY_QUEUE = ".delay.queue";
+    private static final String DELAY_ROUTING_KEY = ".delay.routing.key";
+    private static final String DEAD_QUEUE = ".dead.queue";
+    private static final String DEAD_ROUTING_KEY = ".dead.routing.key";
+
+    private RabbitKeyOrderChildConstants() {
+    }
+
+    /**
+     * 缺省交换机
+     */
+    public static final String DEFAULT_EXCHANGE = PREFIX +"default"+EXCHANGE;
+
+    /**
+     * 缺省延迟队列
+     */
+    public static final String DEFAULT_DELAY_QUEUE = PREFIX +"default"+DELAY_QUEUE;
+    public static final String DEFAULT_DELAY_ROUTING_KEY = PREFIX +"default"+DELAY_ROUTING_KEY;
+    public static final String DEFAULT_DEAD_QUEUE = PREFIX +"default"+DEAD_QUEUE;
+    public static final String DEFAULT_DEAD_ROUTING_KEY = PREFIX +"default"+DEAD_ROUTING_KEY;
+
+    /**
+     * 新增
+     */
+    public static final String ORDER_CHILD_ADD_QUEUE = PREFIX +"orderChild.add"+QUEUE;
+    public static final String ORDER_CHILD_ADD_ROUTING_KEY = PREFIX +"orderChild.add"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 司机确认
+     */
+    public static final String ORDER_CHILD_DRIVER_CONFIRM_QUEUE = PREFIX +"orderChild.driverConfirm"+QUEUE;
+    public static final String ORDER_CHILD_DRIVER_CONFIRM_ROUTING_KEY = PREFIX +"orderChild.driverConfirm"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 运单完成
+     */
+    public static final String CHILD_FINISH_QUEUE = PREFIX +"child.finish"+QUEUE;
+    public static final String CHILD_FINISH_ROUTING_KEY = PREFIX +"child.finish"+QUEUE_ROUTING_KEY;
+
+}

performance-web/src/main/java/com/clx/performance/constant/RabbitKeySettlementConstants.java

+package com.clx.performance.constant;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 结算-mq
+ * @Date: 2023-10-19 15:13:06
+ * @Version: 1.0
+ */
+public class RabbitKeySettlementConstants {
+
+    private static final String PREFIX = "clx-performance.settlement.";
+    private static final String EXCHANGE = ".exchange";
+    private static final String QUEUE = ".queue";
+    private static final String QUEUE_ROUTING_KEY = ".routing.key";
+    private static final String DELAY_QUEUE = ".delay.queue";
+    private static final String DELAY_ROUTING_KEY = ".delay.routing.key";
+    private static final String DEAD_QUEUE = ".dead.queue";
+    private static final String DEAD_ROUTING_KEY = ".dead.routing.key";
+
+    private RabbitKeySettlementConstants() {
+    }
+
+    /**
+     * 缺省交换机
+     */
+    public static final String DEFAULT_EXCHANGE = PREFIX +"default"+EXCHANGE;
+
+    /**
+     * 缺省延迟队列
+     */
+    public static final String DEFAULT_DELAY_QUEUE = PREFIX +"default"+DELAY_QUEUE;
+    public static final String DEFAULT_DELAY_ROUTING_KEY = PREFIX +"default"+DELAY_ROUTING_KEY;
+    public static final String DEFAULT_DEAD_QUEUE = PREFIX +"default"+DEAD_QUEUE;
+    public static final String DEFAULT_DEAD_ROUTING_KEY = PREFIX +"default"+DEAD_ROUTING_KEY;
+
+    /**
+     * 新增计费单
+     */
+    public static final String SETTLEMENT_DETAIL_ADD_QUEUE = PREFIX +"settlementDetail.add"+QUEUE;
+    public static final String SETTLEMENT_DETAIL_ADD_ROUTING_KEY = PREFIX +"settlementDetail.add"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 同步开票标识
+     */
+    public static final String SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_QUEUE = PREFIX +"settlementDetailInvoiceType.sync"+QUEUE;
+    public static final String SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_ROUTING_KEY = PREFIX +"settlementDetailInvoiceType.sync"+QUEUE_ROUTING_KEY;
+
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java

 package com.clx.performance.controller.feign;
 
-import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/feign/OwnerAccountFeignController.java

+package com.clx.performance.controller.feign;
+
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.param.pc.owner.FrozenAccountParam;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/feign/owner")
+@Validated
+@AllArgsConstructor
+public class OwnerAccountFeignController {
+
+    private final OwnerAccountService ownerAccountService;
+
+
+    @ApiOperation(value = "冻结保证金和预付运费", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerAccountFrozen")
+    public Result<Object> ownerAccountFrozen(@RequestBody FrozenAccountParam param) {
+        log.info("进行冻结保证金和预付运费,相关参数{}", JSONUtil.parse(param).toString());
+        ownerAccountService.ownerAccountFrozen(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "解冻保证金和预付运费", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerAccountThaw")
+    public Result<Object> ownerAccountThaw(@RequestBody ThawAccountParam param) {
+        log.info("进行解冻保证金和预付运费账户,相关参数{}", JSONUtil.parse(param).toString());
+        ownerAccountService.ownerAccountThaw(param);
+        return Result.ok();
+    }
+}

performance-web/src/main/java/com/clx/performance/controller/open/OpenOwnerAccountController.java

+package com.clx.performance.controller.open;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.model.OwnerTransferInfo;
+import com.clx.performance.param.open.OpenOwnerBindCardParam;
+import com.clx.performance.param.open.OpenOwnerCaseOutParam;
+import com.clx.performance.param.open.OpenOwnerTopUpParam;
+import com.clx.performance.param.pc.*;
+import com.clx.performance.param.pc.owner.CreteAccountParam;
+import com.clx.performance.param.pc.owner.FrozenAccountParam;
+import com.clx.performance.service.*;
+import com.clx.performance.vo.pc.*;
+import com.clx.user.vo.pc.owner.OwnerBindCardVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/open/owner")
+@Validated
+@AllArgsConstructor
+@Api(tags = "PC-货主资金管理")
+public class OpenOwnerAccountController {
+
+    private final OwnerAccountService ownerAccountService;
+
+
+    @ApiOperation(value = "账户充值", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountTopUp")
+    @UnitCovert(param = false)
+    public Result<Long> openAccountTopUp(@RequestBody OpenOwnerTopUpParam param) {
+        Long id = ownerAccountService.openAccountTopUp(param);
+        return Result.ok(id);
+    }
+
+    @ApiOperation(value = "账户提现", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountCaseOut")
+    @UnitCovert(param = false)
+    public Result<Long> accountCaseOut(@RequestBody OpenOwnerCaseOutParam param) {
+        Long id = ownerAccountService.openAccountCaseOut(param);
+        return Result.ok(id);
+    }
+
+    @ApiOperation(value = "获取货主信息绑卡信息", notes = "<br>By:胡宇帆")
+    @GetMapping("/getOwnerBindCard")
+    public Result<OwnerBindCardVO> getOwnerBindCard(@RequestParam Long userNo) {
+        return Result.ok(ownerAccountService.getOwnerBindCard(userNo));
+    }
+
+    @ApiOperation(value = "绑定货主银行卡")
+    @PostMapping({"/bindOwnerBindCard"})
+    Result<Object> openBindOwnerBindCard(@RequestBody OpenOwnerBindCardParam param) {
+        ownerAccountService.openBindOwnerBindCard(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "解绑货主银行卡")
+    @PostMapping({"/unBindOwnerBindCard"})
+    Result<Object> unBindOwnerBindCard(@RequestBody OpenOwnerBindCardParam param) {
+        ownerAccountService.openUnBindOwnerBindCard(param);
+        return Result.ok();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -36,8 +36,6 @@ public class CarrierOrderChildController {
 
     private final OrderChildService orderChildService;
 
-    private final OrderChildPoundAuditService orderChildPoundAuditService;
-
     @ApiOperation(value = "运单列表",notes = "<br>By:李瑞新")
     @PostMapping("/pageCarrierOrderChildList")
     @UnitCovert(param = false)

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -6,6 +6,8 @@ import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
+import com.clx.performance.param.pc.OrderGoodsParams;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RedisConstants;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierAccountController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.*;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.OwnerCaseOutService;
+import com.clx.performance.service.OwnerTopUpService;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import com.clx.performance.vo.pc.OwnerCaseOutVO;
+import com.clx.performance.vo.pc.OwnerTopUpVO;
+import com.clx.user.param.pc.driver.truck.PageDriverTruckParam;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier")
+@Validated
+@Api(tags = "承运端-资金")
+@AllArgsConstructor
+public class CarrierAccountController {
+
+    private final OwnerAccountService ownerAccountService;
+
+    private final OwnerTopUpService ownerTopUpService;
+
+    private final OwnerCaseOutService ownerCaseOutService;
+
+
+    @ApiOperation(value = "查看资金管理列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/pageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountVO>> pageList(@RequestBody PageOwnerAccountListParam param) {
+        IPage<OwnerAccountVO> page = ownerAccountService.pageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "保证金账户详情流水列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/marginAccountPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountRunningWaterRecordVO>> marginAccountPageList(@RequestBody PagePlatformMarginAccountParam param) {
+        IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.marginAccountPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "保证金账户详情流水下载")
+    @PostMapping("/exportMarginAccountPageList")
+    public void exportMarginAccountPageList(@RequestBody @Validated PagePlatformMarginAccountParam param, HttpServletResponse response) throws Exception {
+        SXSSFWorkbook workbook = ownerAccountService.exportMarginAccountPageList(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+    }
+
+    @ApiOperation(value = "预付金账户详情流水列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/prepaidFreightAccountPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountRunningWaterRecordVO>> prepaidFreightAccountPageList(@RequestBody PagePlatformPrepaidFreightAccountParam param) {
+        IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightAccountPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "预付金账户详情流水下载")
+    @PostMapping("/exportPrepaidFreightAccountPageList")
+    public void exportPrepaidFreightAccountPageList(@RequestBody @Validated PagePlatformPrepaidFreightAccountParam param, HttpServletResponse response) throws Exception {
+        SXSSFWorkbook workbook = ownerAccountService.exportPrepaidFreightAccountPageList(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+    }
+
+
+    @ApiOperation(value = "充值审批", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountTopUpApprove")
+    public Result<Object> accountTopUpApprove(@RequestBody PlatformAccountTopUpParam param) {
+        ownerAccountService.accountTopUpApprove(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "提现审批", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountCaseOutApprove")
+    @UnitCovert()
+    public Result<Object> accountCaseOutApprove(@RequestBody OwnerCaseOutApproveParam param) {
+        ownerAccountService.accountCaseOutApprove(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "充值审批列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerTopUpPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerTopUpVO>> ownerTopUpPageList(@RequestBody PageOwnerTopUpListParam param) {
+        IPage<OwnerTopUpVO> page = ownerTopUpService.ownerTopUpPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "提现审批列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerCaseOutPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerCaseOutVO>> ownerCaseOutPageList(@RequestBody PageOwnerCaseOutListParam param) {
+        IPage<OwnerCaseOutVO> page = ownerCaseOutService.ownerCaseOutPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementDriverController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
+import com.clx.performance.service.settle.SettlementDriverService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementDriver")
+@Validated
+@Api(tags = "承运端-结算管理-车主结算单")
+@AllArgsConstructor
+public class CarrierSettlementDriverController {
+
+    private final SettlementDriverService settlementDriverService;
+
+
+    @ApiOperation(value = "结算单列表（车主）",notes = "<br>By:刘海泉")
+    @PostMapping("/pageCarrierSettlementDriver")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementDriverVO>> pageCarrierSettlementDriver(@RequestBody @Validated PageCarrierSettlementDriverParam param) {
+        IPage<CarrierPageSettlementDriverVO> page  = settlementDriverService.pageCarrierSettlementDriver(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementDriverDetailController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.service.settle.SettlementDriverDetailService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementDriverDetail")
+@Validated
+@Api(tags = "承运端-计费管理")
+@AllArgsConstructor
+public class CarrierSettlementDriverDetailController {
+
+    private final SettlementDriverDetailService settlementDriverDetailService;
+
+
+    @ApiOperation(value = "运单计费列表（车主）",notes = "<br>By:刘海泉")
+    @PostMapping("/pageSettlementDriverDetail")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementDriverDetailVO>> pageSettlementDriverDetail(@RequestBody @Validated PageCarrierSettlementDriverDetailParam param) {
+        IPage<CarrierPageSettlementDriverDetailVO> page = settlementDriverDetailService.pageSettlementDriverDetail(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

+package com.clx.performance.controller.pc.carrier;
+
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.*;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import com.clx.performance.vo.pc.carrier.settle.*;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementOwner")
+@Validated
+@Api(tags = "承运端-货主结算")
+@AllArgsConstructor
+public class CarrierSettlementOwnerController {
+
+    private final SettlementOwnerService settlementOwnerService;
+
+
+    @ApiOperation(value = "结算单详情",notes = "<br>By:李瑞新")
+    @GetMapping("/getCarrierSettlementOwnerDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerDetailVO> getCarrierSettlementOwnerDetail(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
+    }
+
+
+
+    @ApiOperation(value = "承运端-结算单列表（货主）",notes = "<br>By:刘海泉")
+    @PostMapping("/pageCarrierSettlementOwner")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementOwnerVO>> pageCarrierSettlementOwner(@RequestBody @Validated PageCarrierSettlementOwnerParam param) {
+        IPage<CarrierPageSettlementOwnerVO> page = settlementOwnerService.pageCarrierSettlementOwner(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+    @ApiOperation(value = "货主结算单下载",notes = "<br>By:姜文业")
+    @PostMapping("/exportCarrierSettlementOwnerPageList")
+    public void exportCarrierSettlementOwnerPageList(@RequestBody @Validated PageCarrierSettlementOwnerParam param, HttpServletResponse response) throws Exception {
+        SXSSFWorkbook workbook = settlementOwnerService.exportCarrierSettlementOwnerPageList(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+    }
+
+    @ApiOperation(value = "货主结算单快递页面开票信息",notes = "<br>By:姜文业")
+    @GetMapping("/getCarrierSettlementOwnerInvoiceCompany")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerCompanyVO> getCarrierSettlementOwnerInvoiceCompany(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerInvoiceCompany(id));
+    }
+
+    @ApiOperation(value = "货主结算单快递页面联系人信息",notes = "<br>By:姜文业")
+    @GetMapping("/getCarrierSettlementOwnerCompanyContact")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerCompanyContactVO> getCarrierSettlementOwnerCompanyContact(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerCompanyContact(id));
+    }
+
+    @ApiOperation(value = "货主结算单付款页面收款人信息",notes = "<br>By:姜文业")
+    @GetMapping("/getCarrierSettlementOwnerPayee")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerPayeeVO> getCarrierSettlementOwnerPayee(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerPayee(id));
+    }
+
+    @ApiOperation(value = "货主结算单快递页面快递信息",notes = "<br>By:姜文业")
+    @GetMapping("/getCarrierSettlementOwnerExpress")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerExpressVO> getCarrierSettlementOwnerExpress(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerExpress(id));
+    }
+
+    @ApiOperation(value = "货主结算单上传结算凭证",notes = "<br>By:姜文业")
+    @PostMapping("/uploadInvoiceImg")
+    public Result uploadInvoiceImg(@RequestBody @Validated UploadInvoiceImgParam param) {
+        settlementOwnerService.uploadInvoiceImg(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单填写快递信息",notes = "<br>By:姜文业")
+    @PostMapping("/saveExpress")
+    public Result saveExpress(@RequestBody @Validated SaveExpressParam param) {
+        settlementOwnerService.saveExpress(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单付款提交",notes = "<br>By:姜文业")
+    @PostMapping("/savePayee")
+    public Result savePayee(@RequestBody @Validated SavePayeeParam param) {
+        settlementOwnerService.savePayee(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "编辑结算单状态",notes = "<br>By:姜文业")
+    @PostMapping("/updateStatusByOrderNo")
+    public Result updateStatusByOrderNo(@RequestBody @Validated UpdateStatusParam param) {
+        log.info("履约服务进行结算单状态更改，参数{}", JSONUtil.parse(param));
+        settlementOwnerService.updateStatusByOrderNo(param.getOrderNo(), param.getSettlementPeriodType(), param.getFromStatus(), param.getToStatus());
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单付款确认",notes = "<br>By:姜文业")
+    @GetMapping("/payeeConfirm")
+    @UnitCovert(param = false)
+    public Result payeeConfirm(@NotNull(message = "结算单号不能为空") String settlementNo) {
+        settlementOwnerService.payeeConfirm(settlementNo);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "获取结算平台收款账号",notes = "<br>By:李瑞新")
+    @GetMapping("/getSettlementPlatformAccount")
+    public Result<SettlementPlatformAccountVO> getSettlementPlatformAccount(@NotNull(message = "结算单号不能为空") String settlementNo) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementPlatformAccount(settlementNo));
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerDetailController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementOwnerDetail")
+@Validated
+@Api(tags = "承运端-计费管理")
+@AllArgsConstructor
+public class CarrierSettlementOwnerDetailController {
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+
+    @ApiOperation(value = "运单计费列表（货主）",notes = "<br>By:刘海泉")
+    @PostMapping("/pageSettlementOwnerDetail")
+    @UnitCovert(param = false)
+    public Result<PageData<CarrierPageSettlementOwnerDetailVO>> pageSettlementOwnerDetail(@RequestBody @Validated PageCarrierSettlementOwnerDetailParam param) {
+        IPage<CarrierPageSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageSettlementOwnerDetail(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+    @ApiOperation(value = "货主结算单运单明细",notes = "<br>By:姜文业")
+    @PostMapping("/pageOwnerSettlementOrderDetailList")
+    @UnitCovert(param = false)
+    public Result<PageData<PageOwnerSettlementOwnerDetailVO>> pageOwnerSettlementOrderDetailList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param) {
+        IPage<PageOwnerSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageOwnerSettlementOrderDetailList(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+    @ApiOperation(value = "货主结算单下载",notes = "<br>By:姜文业")
+    @PostMapping("/exportOwnerSettlementOrderDetailList")
+    public void exportCarrierSettlementOwnerPageList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {
+        SXSSFWorkbook workbook = settlementOwnerDetailService.exportOwnerSettlementOrderDetail(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

+package com.clx.performance.controller.pc.owner;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.enums.OwnerAccountEnum;
+import com.clx.performance.model.OwnerTransferInfo;
+import com.clx.performance.param.pc.*;
+import com.clx.performance.param.pc.owner.CreteAccountParam;
+import com.clx.performance.param.pc.owner.FrozenAccountParam;
+import com.clx.performance.service.*;
+import com.clx.performance.vo.pc.*;
+import com.clx.user.feign.OwnerInfoFeign;
+import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
+import com.clx.user.vo.pc.owner.OwnerBindCardVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+@RequestMapping("/pc/owner")
+@Validated
+@AllArgsConstructor
+@Api(tags = "PC-货主资金管理")
+public class OwnerAccountController {
+
+    private final OwnerAccountService ownerAccountService;
+
+    private final OwnerTopUpService ownerTopUpService;
+
+    private final OwnerCaseOutService ownerCaseOutService;
+
+    private final OwnerRunningWaterRecordService ownerRunningWaterRecordService;
+
+    private final OwnerBindCardRecordService ownerBindCardRecordService;
+
+
+    @ApiOperation(value = "账户信息", notes = "<br>By:胡宇帆")
+    @GetMapping("/accountInfo")
+    @UnitCovert(param = false)
+    public Result<Map> accountInfo() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Map<String,OwnerAccountVO> result = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
+        return Result.ok(result);
+    }
+
+    @ApiOperation(value = "货主充值记录列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerTopUpPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerTopUpVO>> ownerTopUpPageList(@RequestBody PageOwnerTopUpListParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setOwnerUserNo(loginUserInfo.getUserNo());
+        IPage<OwnerTopUpVO> page = ownerTopUpService.ownerTopUpPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "货主提现记录列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerCaseOutPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerCaseOutVO>> ownerCaseOutPageList(@RequestBody PageOwnerCaseOutListParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setUserNo(loginUserInfo.getUserNo());
+        IPage<OwnerCaseOutVO> page = ownerCaseOutService.ownerCaseOutPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+    @ApiOperation(value = "账户充值", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountTopUp")
+    @UnitCovert
+    public Result<Long> accountTopUp(@RequestBody OwnerTopUpParam param) {
+
+        Long id = ownerAccountService.accountTopUp(param);
+        return Result.ok(id);
+    }
+
+    @ApiOperation(value = "账户提现", notes = "<br>By:胡宇帆")
+    @PostMapping("/accountCaseOut")
+    @UnitCovert
+    public Result<Long> accountCaseOut(@RequestBody OwnerCaseOutParam param) {
+        Long id = ownerAccountService.accountCaseOut(param);
+        return Result.ok(id);
+    }
+
+    @ApiOperation(value = "货主付款确认", notes = "<br>By:胡宇帆")
+    @GetMapping("/accountBalanceConfirm")
+    public Result<Object> accountBalanceConfirm(@RequestParam @NotNull(message = "编号不能为空") Integer id) {
+        ownerAccountService.accountBalanceConfirm(id);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主账户流水列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerAccountRunningWaterPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerAccountRunningWaterRecordVO>> ownerAccountRunningWaterPageList(@RequestBody PageOwnerAccountRunningWaterParam param) {
+        IPage<OwnerAccountRunningWaterRecordVO> page = ownerRunningWaterRecordService.ownerAccountRunningWaterPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "货主账户流水列表下载")
+    @PostMapping("/exportOwnerAccountRunningWaterPageList")
+    public void exportOwnerAccountRunningWaterPageList(@RequestBody @Validated PageOwnerAccountRunningWaterParam param, HttpServletResponse response) throws Exception {
+        SXSSFWorkbook workbook = ownerRunningWaterRecordService.exportOwnerAccountRunningWaterPageList(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+    }
+
+    @ApiOperation(value = "对公转账信息", notes = "<br>By:胡宇帆")
+    @GetMapping("/transferPublic")
+    public Result<OwnerTransferInfo> transferPublic() {
+        return Result.ok(ownerAccountService.transferPublic());
+    }
+
+    @ApiOperation(value = "获取货主信息绑卡信息", notes = "<br>By:胡宇帆")
+    @GetMapping("/getOwnerBindCard")
+    public Result<OwnerBindCardVO> getOwnerBindCard() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        return Result.ok(ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo()));
+    }
+
+    @ApiOperation(value = "绑定货主银行卡")
+    @PostMapping({"/bindOwnerBindCard"})
+    Result<Object> bindOwnerBindCard(@RequestBody OwnerBindCardParam param) {
+        ownerAccountService.bindOwnerBindCard(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "解绑货主银行卡")
+    @PostMapping({"/unBindOwnerBindCard"})
+    Result<Object> unBindOwnerBindCard(@RequestBody OwnerBindCardParam param) {
+        ownerAccountService.unBindOwnerBindCard(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主绑卡记录列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerBindCardPageList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerBindCardRecordVO>> ownerBindCardPageList(@RequestBody PageOwnerBindCardRecordListParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setOwnerUserNo(loginUserInfo.getUserNo());
+        IPage<OwnerBindCardRecordVO> page = ownerBindCardRecordService.ownerBindCardPageList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "创建账户", notes = "<br>By:胡宇帆")
+    @PostMapping("/createAccount")
+    public Result<Object> createAccount(CreteAccountParam param) {
+        ownerAccountService.createAccount(param);
+        return Result.ok();
+    }
+}

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOwnerController.java

+package com.clx.performance.controller.pc.owner;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.OwnerConfirmSettlementParam;
+import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
+import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/owner/settlementOwner")
+@Validated
+@Api(tags = "货主端-货主结算")
+@AllArgsConstructor
+public class OwnerSettlementOwnerController {
+
+    private final SettlementOwnerService settlementOwnerService;
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+
+
+    @ApiOperation(value = "结算单详情",notes = "<br>By:李瑞新")
+    @GetMapping("/getOwnerSettlementOwnerDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerDetailVO> getOwnerSettlementOwnerDetail(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
+    }
+
+
+    @ApiOperation(value = "确认结算单接口",notes = "<br>By:李瑞新")
+    @PostMapping("/updateConfirmSettlement")
+    public Result updateConfirmSettlement(@RequestBody @Validated OwnerConfirmSettlementParam param) {
+        settlementOwnerService.updateConfirmSettlement(param.getId());
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "获取结算平台收款账号",notes = "<br>By:李瑞新")
+    @GetMapping("/getSettlementPlatformAccount")
+    public Result<SettlementPlatformAccountVO> getSettlementPlatformAccount() {
+        return Result.ok(settlementOwnerService.getSettlementPlatformAccount());
+    }
+
+    @ApiOperation(value = "付款接口",notes = "<br>By:李瑞新")
+    @PostMapping("/updatePaymentSettlement")
+    public Result updatePaymentSettlement(@RequestBody @Validated OwnerPaymentSettlementParam param) {
+        settlementOwnerService.updatePaymentSettlement(param);
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "付款确认接口",notes = "<br>By:李瑞新")
+    @PostMapping("/updatePaymentConfirmSettlement")
+    public Result updatePaymentConfirmSettlement(@RequestBody @Validated OwnerConfirmSettlementParam param) {
+        settlementOwnerService.updatePaymentConfirmSettlement(param.getId());
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "结算运单明细",notes = "<br>By:李瑞新")
+    @PostMapping("/pageOwnerSettlementOrderDetailList")
+    @UnitCovert(param = false)
+    public Result<PageData<PageOwnerSettlementOwnerDetailVO>> pageOwnerSettlementOrderDetailList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param) {
+        IPage<PageOwnerSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageOwnerSettlementOrderDetailList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "导出结算运单明细")
+    @PostMapping("/exportOwnerSettlementOrderDetail")
+    public Result exportOwnerSettlementOrderDetail(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {
+
+        SXSSFWorkbook workbook = settlementOwnerDetailService.exportOwnerSettlementOrderDetail(param);
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        workbook.write(response.getOutputStream());
+        return null;
+    }
+
+    @ApiOperation(value = "货主端-结算单列表" ,notes = "<br>By:李瑞新")
+    @PostMapping("/pageSettlementOwner")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerPageSettlementOwnerVO>> pageSettlementOwner(@RequestBody @Validated PageOwnerSettlementParam param){
+        IPage<OwnerPageSettlementOwnerVO> page = settlementOwnerService.pageSettlementOwner(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.service.TempService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value="/temp")
 public class TempController {
 
+    @Autowired
+    private TempService tempService;
+
+
 
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/test", method = RequestMethod.GET)
@@ -26,4 +32,13 @@ public class TempController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "更新网运标识", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/updateInvoiceType", method = RequestMethod.POST)
+    public Result<Void> updateInvoiceType(String childNo, Integer invoiceType) {
+
+        tempService.updateInvoiceType(childNo, invoiceType);
+
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -80,6 +80,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
                                                @Param("list")List<String> orderGoodsNoList
     );
 
+    OrderChild getGoingLatestOrderChildByOrderNo(String orderNo);
+
     List<OrderChild> selectResidueWeight(String orderNo,Integer status);
 
     List<OrderChild> selectResidueWeightByOrderGoodsNo(String orderGoodsNo,Integer status);

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;

performance-web/src/main/java/com/clx/performance/dao/OwnerAccountDao.java

+package com.clx.performance.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.OwnerAccountMapper;
+import com.clx.performance.model.OwnerAccount;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import com.msl.common.dao.BaseDao;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface OwnerAccountDao extends BaseDao<OwnerAccountMapper, OwnerAccount, Integer> {
+    IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param);
+
+    List<OwnerAccount> accountInfo(Long ownerUserNo);
+
+    OwnerAccount getAccountByOwnerUserNoAndAccountType(Long ownerUserNo, Integer accountType);
+
+    Integer updateOwnerAccountForConfirm(OwnerAccount account);
+
+    Integer updateAccountCAS(OwnerAccount account, LocalDateTime now, boolean flag);
+
+    Integer thawAccount(OwnerAccount account, LocalDateTime now);
+
+}

performance-web/src/main/java/com/clx/performance/dao/OwnerBindCardRecordDao.java

+package com.clx.performance.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.OwnerBindCardRecordMapper;
+import com.clx.performance.model.OwnerBindCardRecord;
+import com.clx.performance.param.pc.PageOwnerBindCardRecordListParam;
+import com.clx.performance.vo.pc.OwnerBindCardRecordVO;
+import com.msl.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
+
+public interface OwnerBindCardRecordDao extends BaseDao<OwnerBindCardRecordMapper, OwnerBindCardRecord, Integer> {
+
+    OwnerBindCardRecord getOwnerBindCardByUserNo(@Param("userNo")Long userNo);
+
+    IPage<OwnerBindCardRecordVO> ownerBindCardPageList(PageOwnerBindCardRecordListParam param);
+}

performance-web/src/main/java/com/clx/performance/dao/OwnerCaseOutDao.java

+package com.clx.performance.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.OwnerCaseOutMapper;
+import com.clx.performance.model.OwnerCaseOut;
+import com.clx.performance.param.pc.PageOwnerCaseOutListParam;
+import com.clx.performance.vo.pc.OwnerCaseOutVO;
+import com.msl.common.dao.BaseDao;
+
+public interface OwnerCaseOutDao extends BaseDao<OwnerCaseOutMapper, OwnerCaseOut, Integer> {
+
+    IPage<OwnerCaseOutVO> ownerCaseOutPageList(PageOwnerCaseOutListParam param);
+}

performance-web/src/main/java/com/clx/performance/dao/OwnerRunningWaterRecordDao.java

+package com.clx.performance.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
+import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
+import com.clx.performance.param.pc.PagePlatformMarginAccountParam;
+import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRecordMapper, OwnerRunningWaterRecord, Integer> {
+
+
+    IPage<OwnerAccountRunningWaterRecordVO> marginAccountPageList(PagePlatformMarginAccountParam param);
+
+    IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
+
+    List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param);
+
+
+    IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param);
+
+    List<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterList(PageOwnerAccountRunningWaterParam param);
+
+
+    List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo);
+
+    List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param);
+}