Merge branch 'v6.4_transportation_20231110' into release

performance-api/src/main/java/com/clx/performance/constant/ActionConstants.java

+package com.clx.performance.constant;
+
+public class ActionConstants {
+
+    public static final String CLX_PAYMENT_PAY = "clx.payment.pay";
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum BreakContractOwnerRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum PayStatus {
+        NOT(0, "未缴费"),
+        YES(1, "已缴费"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<PayStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(PayStatus::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CompensationStatusStatus {
+        NOT(0, "未赔付"),
+        YES(1, "已赔付"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<CompensationStatusStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(CompensationStatusStatus::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum ConfirmStatus {
+        CONFIRMING(0, "确认中"),
+        CONFIRMED(1, "已确认"),
+        REJECT(2, "已驳回"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ConfirmStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(ConfirmStatus::getMsg).orElse(null);
+        }
+    }
+
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum BreakContractRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum TriggerType {
+        SYSTEM(1, "系统触发"),
+        MANUAL(2, "手动触发"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<TriggerType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+    @Getter
+    @AllArgsConstructor
+    public enum BreakContractPartyType {
+        PLATFORM(1, "平台"),
+        OWNER(2, "货主"),
+        DRIVER(3, "司机"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<BreakContractPartyType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum BreakContractSettlementDriverEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum BreakContractPartyType {
+        PLATFORM(1, "平台"),
+        OWNER(2, "货主"),
+        DRIVER(3, "车主"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<BreakContractPartyType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(BreakContractPartyType::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SettleStatus {
+        NO(1, "待结算"),
+        YES(2, "已结算"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<SettleStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(SettleStatus::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SettlePlatform {
+        MSL(0, "马上来"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<SettlePlatform> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(SettlePlatform::getMsg).orElse(null);
+        }
+    }
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum BreakContractSettlementLogEnum {
+    ;
+
+    @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, "货主确认付款"),
+        COMPLETED(8, "已完结"),
+        CANCEL(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);
+        }
+    }
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum DeleteStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+    }
+
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum BreakContractSettlementOwnerEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        TO_BE_ACCOUNT(10, "待对账"),
+        OWNER_TO_BE_CONFIRMED(20, "待货主确认"),
+        SHIPPER_TO_PAYMENT (30, "待货主付款"),
+        PLATFORM_CONFIRMED_OWNER_PAYMENT(40, "待平台确认付款"),
+        PLATFORM_TO_PAYMENT(50, "待平台付款"),
+        OWNER_CONFIRMED_PLATFORM_PAYMENT(60, "待货主确认付款"),
+        COMPLETED(70, "已完结"),
+        CANCEL(80, "已取消"),
+
+        ;
+
+        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/CancelOrderEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum CancelOrderEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+        NOT_CHILD(1, "违约无运单"),
+        NOT_TRANSPORTED(2, "取消未拉运吨数"),
+        NOT_ARRIVE(3, "取消未到达货源地"),
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Type> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+    }
+
+
+}

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

@@ -33,6 +33,7 @@ public enum OrderChildEnum {
         DRIVER_CANCEL(110, "司机取消"),
         PLATFORM_CANCEL(111, "承运取消"),
         OWNER_CANCEL(112, "货主取消"),
+        ARTIFICIAL_CANCEL(113, "客服取消"),
 
 //
 //        OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆
@@ -77,14 +78,42 @@ public enum OrderChildEnum {
 
         ;
 
-        private final int code;
+        private final Integer code;
         private final String name;
 
-        public static Optional<Status> getByCode(int code) {
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getName).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CancelType {
+        PERSONAL(1, "个人原因"),
+        PRICE(2, "价格不合适"),
+        LOAD(3, "无法装货"),
+        TRUCK(4, "车辆原因"),
+        TRAFFIC_RESTRICTION(5, "交通管制"),
+        TRAFFIC_ACCIDENT(6, "交通事故"),
+        ADDRESS(7, "无法找到地址"),
+        WAIT(8, "排队时间较长"),
+        OTHER(9, "其他原因"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<CancelType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
     }
 
+
     // 运输中
     public static final List<Integer> TRANSIT_lIST = Arrays.asList(
             Status.CREATED.getCode(),
@@ -99,11 +128,22 @@ public enum OrderChildEnum {
 
     );
 
+    //dts 监听的取消运单
+    public static final List<Integer> DTS_LISTEN_CANCEL_lIST = Arrays.asList(
+            Status.DRIVER_CANCEL.getCode(),
+            Status.PLATFORM_CANCEL.getCode(),
+            Status.OWNER_CANCEL.getCode(),
+            Status.ARTIFICIAL_CANCEL.getCode()
+
+    );
+
+
     // 取消
     public static final List<Integer> CANCEL_lIST = Arrays.asList(
             Status.DRIVER_CANCEL.getCode(),
             Status.PLATFORM_CANCEL.getCode(),
-            Status.OWNER_CANCEL.getCode()
+            Status.OWNER_CANCEL.getCode(),
+            Status.ARTIFICIAL_CANCEL.getCode()
 
     );
 
@@ -127,7 +167,11 @@ public enum OrderChildEnum {
             Status.LOAD.getCode(),
             Status.GO_TO_RECEIVE.getCode(),
             Status.ARRIVE_RECEIVE.getCode(),
-            Status.UNLOAD.getCode()
+            Status.UNLOAD.getCode(),
+            Status.DRIVER_CANCEL.getCode(),
+            Status.PLATFORM_CANCEL.getCode(),
+            Status.OWNER_CANCEL.getCode(),
+            Status.ARTIFICIAL_CANCEL.getCode()
 
     );
 

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

@@ -39,6 +39,7 @@ public enum OrderChildLogEnum {
         DRIVER_CANCEL(110, "司机取消"),
         PLATFORM_CANCEL(111, "承运取消"),
         OWNER_CANCEL(112, "货主取消"),
+        ARTIFICIAL_CANCEL(113, "客服取消"),
 
         ;
 
@@ -56,6 +57,7 @@ public enum OrderChildLogEnum {
         OWNER(1, "货主"),
         PLATFORM(2, "承运"),
         DRIVER(3, "司机"),
+        ARTIFICIAL(4, "客服"),
 
         ;
 

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+public enum OrderGoodsLogsEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        EDIT("编辑"),
+        CANCEL( "取消"),
+        ADJUST_PRICE("调价"),
+        ;
+        private final String name;
+
+    }
+
+
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+public enum OrderGoodsOverWeightEnum {
+
+    NO(0, "否"),
+    YES(1, "是"),
+    ;
+
+    private final Integer code;
+    private final String name;
+
+    public static Optional<OrderGoodsOverWeightEnum> getByCode(Integer code) {
+        return Arrays.stream(values()).filter(e -> e.code .equals(code)).findFirst();
+    }
+
+
+}

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

@@ -13,16 +13,16 @@ public enum OrderGoodsPendingVehicleUsageEnum {
     @AllArgsConstructor
     public enum Status {
 
-        PLATFORM_TRUCK("1", "平台车辆配货"),
+        PLATFORM_TRUCK(1, "平台车辆配货"),
 
-        OWN_TRUCK("2", "自有车辆配货"),
+        OWN_TRUCK(2, "自有车辆配货"),
         ;
 
-        private final String code;
+        private final Integer code;
         private final String name;
 
-        public static Optional<Status> getByCode(String code) {
-            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        public static Optional<Status> getByCode(String c) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(c)).findFirst();
         }
     }
 

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderGoodsStopEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+
+        NO(0, "未暂停"),
+
+        YES(1, "已暂停")
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

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

@@ -4,9 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 public enum OrderGoodsTruckBindEnum {
     ;
@@ -15,11 +13,12 @@ public enum OrderGoodsTruckBindEnum {
     @AllArgsConstructor
     public enum Status {
 
-        SUCCESS(1, "正常"),
+        NORMAL(1, "正常"),
 
         CANCEL(2, "取消"),
         GET(3, "已接单"),
-        EXPIRE(4, "已失效")
+        EXPIRE(4, "已失效"),
+        SUCCESS(5, "结束")
 
         ;
 

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

@@ -55,7 +55,27 @@ public enum OwnerAccountEnum {
         ;
         private final Integer code;
         private final String msg;
+        public String getMsg() {
+            return this.msg;
+        }
 
+        public Integer getCode() {
+            return this.code;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum OrderChildTypeStatus {
+        ORDINARY(1, "普通单"),
+        NETWORK(2, "网运单"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public Integer getCode() {
+            return this.code;
+        }
     }
 
     @Getter

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

@@ -33,8 +33,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     DATA_REPEAT(1106, "数据重复"),
 
 
-    ORDER_NO_FOUND(1200, "货单不存在"),
-    ORDER_WEIGHT_LACK(1201, "剩余数量不足"),
+    ORDER_GOODS_NO_FOUND(1200, "货单不存在"),
+    ORDER_WEIGHT_LACK(1201, "剩余吨数不足，请联系客服"),
     ORDER_INVALID(1202, "无效的货单"),
     ORDER_INVALID1(1203, "当前运单的货源已完成或取消，请查看其他货源"),
 
@@ -50,6 +50,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_TRUCK_MODEL_ERROR(1323, "请选择合适的车型"),
     ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR(1324, "请选择定向车辆"),
     ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR1(1325, "请选择非定向车辆"),
+    ORDER_CHILD_DRIVER_TAKE_ORDER_TIME_LIMIT(1326, "你已因违约行为被限制接单，限制时间至"),
 
     ORDER_CHILD_LOAD_TIME_ERROR(1341, "非装车时间段"),
     ORDER_CHILD_UNLOAD_TIME_ERROR(1342, "非卸车时间段"),
@@ -67,14 +68,34 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_CANCEL_FORBID_COUNT(1383, "今日取消运单次数超过上限，暂时无法取消"),
     ORDER_GOODS_ID_GENERATE_LOCK(1384, "货单编号ID获取锁出问题"),
 
+
     INTEGRAL_TRUCK_DRIVER_EXIST(1400, "车辆已添加"),
     INTEGRAL_ORDER_EXIST(1401, "货单已添加"),
     INTEGRAL_ORDER_NO_EXIST(1402, "货单不存在"),
     INTEGRAL_TRUCK_NO_EXIST(1403, "车辆不存在"),
-    SETTLEMENT_ORDER_STATUS_CHANGED(1404, "结算单状态已变更，请重新刷新页面"),
-    SETTLEMENT_NO_FOUND(1405, "结算单不存在"),
 
+    ORDER_NO_FOUND(1500, "订单不存在"),
+
+    BREAK_CONTRACT_NO_FOUND(1600, "违约不存在"),
+    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, "货主提现金额和平台支付金额不一致"),
+    REJECT_REASON_NULL(1611, "驳回原因不能为空"),
+    REJECT_REASON_TOO_LARGE(1612, "驳回原因过长"),
+
+    ORDER_GOODS_WEIGHT_NOT_HAVE(1601, "货单可拉运吨数不足"),
+    ORDER_GOODS_STATUS_NOT_GET(1602, "当前货单已关闭不可继续提取"),
+
+    INTEGRAL_RULE_NO_FOUND(1700, "积分规则不存在"),
+    INTEGRAL_RULE_RATIO_OVERLAP(1701, "层级划分范围重叠"),
+    INTEGRAL_RULE_RATIO_ALL_EMPTY(1702, "层级划分范围不能全为空"),
+    INTEGRAL_RULE_NAME_EXIST(1703, "层级名称已存在"),
+
+    APP_POP_UP_ERROR(-1000, "app弹窗提示"),
+    WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),
 
     ;
     private final int code;

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum RoleEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        PLATFORM(1, "平台"),
+        OWNER(2, "货主"),
+        DRIVER(3, "司机"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == 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/ThirdRequestStatusEnum.java

+package com.clx.performance.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ThirdRequestStatusEnum {
+
+    HAVING(0, "请求中"),
+    SUCCESS(1, "成功"),
+    FAIL(2, "失败"),
+    ;
+
+    private final int code;
+    private final String mark;
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ThirdRequestTypeEnum {
+
+    SEND(1, "发送请求"),
+    RECEIVE(2, "接收请求"),
+    ;
+
+    private final int code;
+    private final String msg;
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+public enum UserTypeEnum {
+        SYSTEM(0, "系统"),
+        OWNER(1, "货主"),
+        CARRIER(2, "承运端"),
+        DRIVER(3, "司机");
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<UserTypeEnum> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+}

performance-api/src/main/java/com/clx/performance/enums/collect/CollectLineReportEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectLineReportEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        SEND(1, "发货地"),
+        RECEIVE(2, "目的地");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    //1:无法到达货源地 2:无法装货 3：无法到达目的地  4：运单取消  5：装车卸车异常  6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报
+    @Getter
+    @AllArgsConstructor
+    public enum ReportType {
+        UNABLE_TO_SEND_ADDRESS(1, "无法到达货源地"),
+        UNABLE_LOAD(2, "无法装货"),
+        UNABLE_TO_RECEIVE_ADDRESS(3, "无法到达目的地"),
+        LOAD_UNLOAD(4, "装卸车时间过长"),
+
+        NO_TAKE_ORDER(6, "没有接单"),
+        SEND_ADDRESS(7, "货源地情况"),
+
+        OTHER(8, "其它上报"),
+        QUALITY(9, "煤炭质量上报"),
+
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReportStatus {
+        NORMAL(1, "正常"),
+        ABNORMAL(2, "异常");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CoalStatus {
+        NO(1, "否"),
+        EXIST(2, "有存煤"),
+        PRODUCTION(3, "现产现装");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<CoalStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        UNAUDIT(0, "待审核"),
+        AUDIT(1, "已审核");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<AuditStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckLocationEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectTruckLocationEnum {
+    ;
+    private Integer truckOrderStatus;               //车辆出车状态 1:空车 2:重车
+    @Getter
+    @AllArgsConstructor
+    public enum TruckOrderStatus {
+        EMPTY(1, "空车"),
+        HEAVY(2, "重车"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<TruckOrderStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckWaitEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectTruckWaitEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReportType {
+        LOAD(1, "装车类型"),
+        UNLOAD(2, "卸车类型");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum waitType {
+        NO(1, "无需排队"),
+        INNER(2, "场内需要排队"),
+        OUTER(3, "场外需要排队");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<waitType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        UNAUDIT(0, "待审核"),
+        AUDIT(1, "已审核");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<AuditStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralRecordEnum.java

+package com.clx.performance.enums.integral;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum IntegralRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type{
+        SYSTEM(1, "系统"),
+        PROTECTION(2, "保护分"),
+        PROTECTION_CANCEL(3, "保护分取消"),
+        SETTLEMENT(4, "结算分"),
+        BASE(5, "基础分"),
+
+        ORDER_CHILD_COMPLETE(11, "运单完成"),
+        ORDER_CHILD_COMPLETE_NUM(12, "运单完成数量"),
+        ORDER_CHILD_COMPLETE_WATER(13, "流水单"),
+        ORDER_CHILD_COMPLETE_SUPPORT(14, "支援单"),
+
+        ORDER_CHILD_CANCEL(21, "运单取消"),
+        ORDER_CHILD_ARRIVE_SEND_ADDRESS_TIMEOUT_CANCEL(22, "超时未到达货源地"),
+        ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_TIMEOUT(23, "超时到达目的地"),
+
+        ORDER_CHILD_PLATFORM_CANCEL(24, "平台取消补偿"),
+        ORDER_CHILD_PLATFORM_COMPENSATION(25, "平台补偿"),
+
+
+        REPORT_TRUCK_INFO(50, "提交基础信息"),
+        REPORT_REFUEL(51, "油表上报"),
+        REPORT_TRAFFIC(52, "上报交通拥堵"),
+        REPORT_SEND_ADDRESS_WAIT(53, "上报货源地需要排队"),
+        REPORT_SEND_ADDRESS_NO_WAIT(54, "上报货源地无需排队"),
+        REPORT_RECEIVE_ADDRESS_WAIT(55, "上报目的地需要排队"),
+        REPORT_RECEIVE_ADDRESS_NO_WAIT(56, "上报目的地无需排队"),
+        REPORT_QUALITY(57, "上报煤炭质量问题"),
+        REPORT_ABNORMAL(58, "上报拉运异常问题"),
+        REPORT_SEND_ADDRESS_INFO(59, "上报货源地情况"),
+        ;
+
+        private Integer value;
+        private String msg;
+    }
+
+    // 取消
+    public static final List<Integer> DRIVER_REPORT_lIST = Arrays.asList(
+            Type.REPORT_TRUCK_INFO.value,
+            Type.REPORT_REFUEL.value,
+            Type.REPORT_TRAFFIC.value,
+            Type.REPORT_SEND_ADDRESS_WAIT.value,
+            Type.REPORT_SEND_ADDRESS_NO_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.value,
+            Type.REPORT_QUALITY.value,
+            Type.REPORT_ABNORMAL.value
+
+    );
+    // 取消
+    public static final List<Integer> PLATFORM_CANCEL_lIST = Arrays.asList(
+            Type.REPORT_TRUCK_INFO.value,
+            Type.REPORT_REFUEL.value,
+            Type.REPORT_TRAFFIC.value,
+            Type.REPORT_SEND_ADDRESS_WAIT.value,
+            Type.REPORT_SEND_ADDRESS_NO_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_WAIT.value,
+            Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.value,
+            Type.REPORT_QUALITY.value,
+            Type.REPORT_ABNORMAL.value
+
+    );
+
+}

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralTruckRuleEnum.java

+package com.clx.performance.enums.integral;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum IntegralTruckRuleEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Status{
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

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

@@ -31,8 +31,8 @@ public enum SettlementOwnerEnum {
     @Getter
     @AllArgsConstructor
     public enum InvoiceStatus {
-        All_INVOICED(1, "已开票"),
-        PARTIAL_INVOICED(2, "部分开票"),
+        INVOICED(1, "已开票"),
+        NOT_INVOICE(2, "未开票"),
         NO_NEED_INVOICE(3, "无需开票");
         private final Integer code;
         private final String msg;

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementWayEnum.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 SettlementWayEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum WayType {
+        LOAD(1, "装车净重"),
+        UNLOAD(2, "卸车净重");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<WayType> 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(WayType::getMsg).orElse(null);
+        }
+    }
+
+
+
+}

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

+package com.clx.performance.feign;
+
+import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
+import com.msl.common.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.constraints.NotNull;
+
+@FeignClient(name = "clx-performance")
+public interface OrderChildFeign {
+
+
+    /**
+     * 线路运单统计
+     */
+    @RequestMapping(value = "clx-performance/feign/orderChild/lineStatistics", method = RequestMethod.GET)
+    Result<OrderChildLineStatisticsVO> lineStatistics(@RequestParam @NotNull(message = "发货地址不可为空") Integer sendSystemAddressId,
+                                              @RequestParam @NotNull(message = "收货货地不可为空") Integer receiveSystemAddressId);
+
+}

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

 package com.clx.performance.feign;
 
+import com.clx.performance.param.app.collect.CollectTruckParam;
+import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
+import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.OrderChildReportParam;
 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.app.collect.AppCollectTruckVO;
+import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,6 +62,23 @@ public interface PerformanceFeign {
     Result<List<String>> getPrivateTruckList(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo,
                                              @RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo);
 
+
+    @PostMapping(value = {"clx-performance/feign/order/orderCancel"})
+    Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param);
+
+
+    /**
+     * 更新货单暂停标志
+     * @param orderNo
+     * @return
+     */
+    @GetMapping(value = {"clx-performance/feign/orderGoods/updateOrderGoodsStopFlag"})
+    Result<Boolean> updateOrderGoodsStopFlag(@RequestParam("orderNo") String orderNo,@RequestParam("stopFlag") Integer stopFlag);
+
+
+    @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);
 
@@ -62,4 +87,24 @@ public interface PerformanceFeign {
 
     @PostMapping(value = {"clx-performance/pc/carrier/settlementOwner/updateStatusByOrderNo"})
     Result<Object> updateStatusByOrderNo(@RequestBody UpdateStatusParam param);
+
+    @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
+    Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
+    @GetMapping(value = {"clx-performance/feign/orderGoods/updateSystemAddressId"})
+    Result<Boolean> updateSystemAddressId(@RequestParam("ownerAddressId") Integer ownerAddressId,@RequestParam("systemAddressId") Integer systemAddressId);
+
+
+    @GetMapping(value = {"clx-performance/feign/owner/accountInfo"})
+    Result<OwnerAccountAllVO> accountInfo(@RequestParam Long userNo);
+
+    @GetMapping(value = {"clx-performance/feign/breakContract/getRuleInfo"})
+    Result<BreakContractOwnerRuleVO> getRuleInfo(@RequestParam Integer id);
+
+    @PostMapping(value = {"clx-performance/feign/truck/listCollectTruck"})
+    Result<List<AppCollectTruckVO>>  listCollectTruck(@RequestBody CollectTruckParam param);
+
+
+    @PostMapping(value = {"clx-performance/feign/orderGoods/listFreightEstimate"})
+    Result<FreightEstimateVO>  listFreightEstimate(@RequestBody OrderChildReportParam param);
+
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildDriverCancelParam.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Getter
 @Setter
@@ -16,8 +17,13 @@ public class OrderChildDriverCancelParam extends PositionParam {
     @NotBlank(message = "运单编号不能为空")
     private String childNo;
 
+    @ApiModelProperty(value = "取消原因类型：1个人原因, 2价格不合适, 3无法装货, 4车辆原因, 5交通管制, 6交通事故, 7无法找到地址, 8排队时间较长, 9其他原因", example = "1")
+    private Integer cancelType;
+
     @ApiModelProperty(value = "取消原因", example = "信息错误")
-    @NotBlank(message = "取消原因不能为空")
     private String remark;
 
+    @ApiModelProperty(value = "图片列表")
+    private List<String> imageList;
+
 }

performance-api/src/main/java/com/clx/performance/param/app/breakcontract/DriverPageBreakContractDriverRecordParam.java

+package com.clx.performance.param.app.breakcontract;
+
+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.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class DriverPageBreakContractDriverRecordParam extends PageParam {
+
+    @ApiModelProperty(value = "类型：1违约记录 2平台补偿 ", example = "1")
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "开始时间", hidden = true)
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", hidden = true)
+    private String endTime;
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectAutoLoanStatusUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectAutoLoanStatusUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "车贷状态：0无车贷 1有车贷", example = "")
+    private Integer autoLoanStatus;
+    @ApiModelProperty(value = "车贷剩余月份", example = "")
+    private Integer autoLoanMonth;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+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 CollectLineReportAbnormalSaveParam {
+
+    @ApiModelProperty(value = "上报类型：1:无法到达货源地 2:无法装货 3：无法到达目的地  4装车卸车异常", example = "")
+    @NotNull(message = "上报类型不能为空")
+    private Integer reportType;
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达货源地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达货源地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportLoadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadUnloadAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportLoadUnloadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装卸车异常原因", example = "车辆问题")
+    @NotBlank(message = "无法到达装货地原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportNoTakeOrderAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportNoTakeOrderAbnormalSaveParam {
+
+    @ApiModelProperty(value = "货单编号")
+    @NotBlank(message = "货单不能为空")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "没有接单原因", example = "车辆问题")
+    @NotBlank(message = "没有接单原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportOtherSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportOtherSaveParam {
+
+    @ApiModelProperty(value = "上报信息")
+    @NotBlank(message = "上报信息不能为空")
+    private String remark;
+    @ApiModelProperty(value = "上报图片")
+    private List<String> imageList;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportQualitySaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportQualitySaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> imageList;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportReceiveAddressAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportReceiveAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达装货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达装货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAbnormalSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CollectLineReportSendAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达货源地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达货源地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressSaveParam {
+
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "拉运状态：1可以拉运 2不可用拉运", example = "1")
+    @NotNull(message = "拉运状态不能为空")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "状态：1有存煤 2现产现装", example = "1")
+    private Integer status;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportTruckWaitAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportTruckWaitAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTrafficCongestionAuditParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTrafficCongestionAuditParam {
+
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+//    @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "1")
+//    private Integer auditStatus;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTrafficCongestionSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTrafficCongestionSaveParam {
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+
+    @ApiModelProperty(value = "预计拥堵时长（小时）", example = "1.5")
+    private BigDecimal jamTime;
+    @ApiModelProperty(value = "现场照片列表")
+    private List<String> jamImageList;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLeaveSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLeaveSaveParam {
+
+    @ApiModelProperty(value = "请假开始时间")
+    @NotBlank(message = "请假开始时间不能为空")
+    private String beginTime;
+    @ApiModelProperty(value = "请假结束时间")
+    @NotBlank(message = "请假结束时间不能为空")
+    private String endTime;
+    @ApiModelProperty(value = "请假原因")
+    @NotBlank(message = "请假原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLocationSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLocationSaveParam {
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "1")
+    @NotNull(message = "车辆出车状态不能空")
+    private Integer truckOrderStatus;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+    @ApiModelProperty(value = "司机手填地址", example = "北京路1号")
+    private String locationRemark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private List<String> truckNos;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckRefuelSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckRefuelSaveParam {
+
+    @ApiModelProperty(value = "运单编号", example = "10000000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装车油表图片列表")
+    @NotEmpty(message = "装车油表图片不能为空")
+    private List<String> loadImageList;
+    @ApiModelProperty(value = "卸车油表图片列表")
+    @NotEmpty(message = "卸车油表图片不能为空")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "装车油量", example = "1.23")
+    private BigDecimal loadOil;
+    @ApiModelProperty(value = "卸车油量", example = "1.23")
+    private BigDecimal unloadOil;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceLineMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceLineMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "单次任务接受最远距离（公里）", example = "")
+    private Integer distanceLineMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceSendAddressMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceSendAddressMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "接受距货源地最远距离（公里）", example = "")
+    private Integer distanceSendAddressMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportDistanceUsualPlaceMaxUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportDistanceUsualPlaceMaxUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "接受距常驻地最远距离（公里）", example = "")
+    private Integer distanceUsualPlaceMax;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportGoodsTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportGoodsTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "拉运货物意愿：1块煤 2面煤 3煤泥", example = "")
+    private String goodsType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportOverTonnageTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportOverTonnageTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "拉运方式：1标吨 2超吨 3白天标吨晚上超吨", example = "")
+    private Integer overTonnageType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckReportParkAddressUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckReportParkAddressUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆停放位置", example = "")
+    private String parkAddress;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckUnloadTypeUpdateParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckUnloadTypeUpdateParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "卸车类型：1自卸侧翻 2自卸立翻 3非自卸", example = "")
+    private Integer unloadType;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportReceiveAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectWaitReportReceiveAddressSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "排队状态：1 无需排队 2 场内需要排队 3 厂外需要排队", example = "1")
+    @NotNull(message = "排队状态不能为空")
+    private Integer waitType;
+
+    @ApiModelProperty(value = "预计等待时长", example = "1")
+    private BigDecimal stationTime;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> stationImageList;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportSendAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectWaitReportSendAddressSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "排队状态：1 无需排队 2 场内需要排队 3 厂外需要排队", example = "1")
+    @NotNull(message = "排队状态不能为空")
+    private Integer waitType;
+
+    @ApiModelProperty(value = "预计等待时长", example = "1")
+    private BigDecimal stationTime;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> stationImageList;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectLineReportParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectLineReportParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTraficCongestionParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectTraficCongestionParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLeaveParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectTruckLeaveParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLocationParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectTruckLocationParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckRefuelParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectTruckRefuelParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckWaitParam.java

+package com.clx.performance.param.app.collect;
+
+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 PageCollectTruckWaitParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/integral/DriverPageIntegralTruckRankParam.java

+package com.clx.performance.param.app.integral;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class DriverPageIntegralTruckRankParam extends PageParam {
+
+    @ApiModelProperty(value = "车牌列表", hidden = true)
+    List<String> truckNoList;
+
+}

performance-api/src/main/java/com/clx/performance/param/feign/OrderAdjustTonnageDownParam.java

+package com.clx.performance.param.feign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+public class OrderAdjustTonnageDownParam {
+
+    @NotBlank(message = "订单编号不能为空")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @NotNull(message = "调整货物吨数不能为空")
+    @ApiModelProperty(value = "调整货物吨数")
+    private BigDecimal weight;
+
+
+    @NotNull(message = "拉运重量不能为空")
+    @ApiModelProperty(value = "拉运重量")
+    private BigDecimal transportWeight;
+
+    @NotNull(message = "有效运费不能为空")
+    @ApiModelProperty("有效运费")
+    private BigDecimal validFreightPrice;
+
+    @NotNull(message = "违约金方案id不能为空")
+    @ApiModelProperty("违约金方案id")
+    private Integer liquidatedDamagesPlanId;
+
+}

performance-api/src/main/java/com/clx/performance/param/mq/BreakContractDriverRecordAddMqParam.java

+package com.clx.performance.param.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 货主违约规则
+ * @Date: 2023-10-11 17:30:05
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriverRecordAddMqParam {
+
+    private Integer recordId;                         //违规记录id
+
+}

performance-api/src/main/java/com/clx/performance/param/mq/BreakContractOwnerRuleAddMqParam.java

+package com.clx.performance.param.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 货主违约规则
+ * @Date: 2023-10-11 17:30:05
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRuleAddMqParam {
+    
+    private Integer ruleId;                         //规则id
+
+}

performance-api/src/main/java/com/clx/performance/param/mq/BreakContractSettlementDetailAddMqParam.java

+package com.clx.performance.param.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 违约计费明细
+ * @Date: 2023-10-11 17:30:05
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractSettlementDetailAddMqParam {
+    
+    private Integer settlementDetailId;                         //结算明细id
+
+}

performance-api/src/main/java/com/clx/performance/param/mq/IntegralOrderChildFinishMqParam.java

 package com.clx.performance.param.mq;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @Author: aiqingguo
@@ -18,5 +19,31 @@ import lombok.ToString;
 public class IntegralOrderChildFinishMqParam {
     
     private String childNo;                         //运单编号
+    private Integer type;                           //类型：
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+        ARRIVE_SEND_ADDRESS_TIMEOUT_CANCEL(11, "到达货源地超时取消"),
+        ARRIVE_RECEIVE_ADDRESS_TIMEOUT(12, "到达目的地超时"),
+        DRIVER_CONFIRM(13, "司机确认收货"),
+        DRIVER_CANCEL(14, "司机取消"),
+
+        CARRIER_CANCEL(21, "承运取消"),
+        ARTIFICIAL_CANCEL(22, "客服取消"),
+        ORDER_CANCEL(23, "订单取消"),
+        ORDER_GOODS_CANCEL(24, "货单取消"),
+
+        ;
+
+        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();
+        }
+    }
+
 
 }

performance-api/src/main/java/com/clx/performance/param/mq/OrderCancelMqParam.java

+package com.clx.performance.param.mq;
+
+import lombok.Data;
+
+@Data
+public class OrderCancelMqParam {
+
+    private String orderNo;
+
+    // 1:平台  2：货主
+    private String type;
+}

performance-api/src/main/java/com/clx/performance/param/mq/OrderChildCancelMqParam.java

+package com.clx.performance.param.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 OrderChildCancelMqParam {
+
+    private String childNo;         //运单编号
+    private Integer status;         //运单状态
+
+    private Integer opUserType;     //操作人类型 1货主 2承运端 3司机
+    private Long opUserNo;          //操作人
+    private String opUserName;      //操作人名称
+}

performance-api/src/main/java/com/clx/performance/param/pay/NotifyString.java

+package com.clx.performance.param.pay;
+
+import com.msl.common.enums.ResultEnum;
+
+
+/**
+ * 
+ * @author xujianke
+ * @date 2017年6月01日
+ * @description
+ */
+public class NotifyString extends PayResult<String> {
+	/** 支付操作 参考<MessageTypeEnum> */
+	private Integer action;
+	/** 交易单号 */
+	private String orderNo;
+	/** 支付请求唯一ID */
+	private String uuid;
+	/** 出错时的交易单元编号 */
+	private String errorNo;
+	
+	public NotifyString(){
+		super();
+	}
+	public NotifyString(PayResult<String> ret){
+		this.setCode(ret.getCode());
+		this.setMsg(ret.getMsg());
+		this.setData(ret.getData());
+	}
+	public NotifyString(ResultEnum e) {
+		super(e);
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getUuid() {
+		return uuid;
+	}
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public String getErrorNo() {
+		return errorNo;
+	}
+	public void setErrorNo(String errorNo) {
+		this.errorNo = errorNo;
+	}
+	@Override
+	public String toString() {
+		return "NotifyString [action=" + action + ", orderNo=" + orderNo + ", uuid=" + uuid
+				+ ", errorNo=" + errorNo + ", toString()=" + super.toString() + "]";
+	}
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pay/PayResult.java

+package com.clx.performance.param.pay;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.msl.common.enums.ResultEnum;
+
+/**
+ * 
+ * 类： Result
+ * 描述：接口返回结果类
+ * @author wangjf
+ * 时间：2017年3月23日下午3:46:50
+ * 版本：v1.0
+ * 修改人：wangjf
+ */
+public class PayResult<T> {
+	
+	private Integer code; // 返回结果代码，0为成功
+	/**
+	 * 返回结果代码
+	 * 0为成功 ，其他代码请参照代码文档
+	 * @return
+	 */
+	public Integer getCode() {
+		return code;
+	}
+
+	private Long total;//总共记录数
+
+	private Integer pageNum;//总共页数
+
+	/**
+	 * 0代表成功，其他代码请参考《返回值说明文档》 
+	 * 请务必按规定填写！
+	 * @param code 结果代码
+	 */
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	/**
+	 * 错误消息，接口中的错误处理，请务必填写错误消息<br/>
+	 * 当成功时消息应为“success”
+	 * @param msg 错误消息
+	 */
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+	private String msg;
+	private T data;
+	/**
+	 * 默认code = 0,<br/>
+	 * msg = "success"
+	 */
+	public PayResult() {
+		this.code = 0;
+		this.msg = "success";
+	}
+	/**
+	 * 默认code = 0, 
+	 * msg = "success",<br/>
+	 * 当成功返回结果时，可使用此方法，直接将返回结果填写即可
+	 * @param data ，返回结果
+	 */
+	public PayResult(T data) {
+		this.code = 0;
+		this.msg = "success";
+		this.data = data;
+	}
+
+	/**
+	 * 查询列表返回成功
+	 * @param data
+	 * @param pageNum
+	 * @param total
+	 */
+	public PayResult(T data, Integer pageNum, Long total) {
+		this.code = 0;
+		this.msg = "success";
+		this.data = data;
+		this.pageNum = pageNum;
+		this.total = total;
+	}
+
+	/**
+	 * 产生错误时，需要在枚举中拼接自定义返回的内容
+	 * @param e
+	 * @param msg
+	 */
+	public PayResult(ResultEnum e, String msg) {
+		this.code = e.getCode();
+		this.msg = String.format(e.getMsg(), msg);
+	}
+
+	/**
+	 * 产生错误时，可以使用此构造方法，在new时直接填写错误代码及消息即可
+	 * @param code
+	 * @param msg
+	 */
+	public PayResult(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+	public PayResult(Integer code, String msg, T data) {
+		this.code = code;
+		this.msg = msg;
+		this.data = data;
+	}
+	@JsonIgnore
+	public void setResultEnum(ResultEnum e){
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+	}
+	
+	public PayResult(ResultEnum e) {
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+	}
+
+	public PayResult(T data, ResultEnum e) {
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+		this.data = data;
+	}
+
+	public Long getTotal() {
+		return total;
+	}
+
+	public void setTotal(Long total) {
+		this.total = total;
+	}
+
+	public Integer getPageNum() {
+		return pageNum;
+	}
+
+	public void setPageNum(Integer pageNum) {
+		this.pageNum = pageNum;
+	}
+
+	@Override
+	public String toString() {
+		return "Result [code=" + code + ", msg=" + msg + ", data=" + data + "]";
+	}
+
+	/**
+	 * 是否成功
+	 * @return
+	 */
+	public boolean succeed() {
+		return code != null && code == 0;
+	}
+}

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

+package com.clx.performance.param.pc;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ArtificialCancelOrderParam {
+
+    @NotNull(message = "运单编号不能为空")
+    @ApiModelProperty("运单编号")
+    private String orderChildNo;
+
+    @ApiModelProperty("取消原因")
+    private String remark;
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+
+@Getter
+@Setter
+public class OrderCancelFeignParam {
+
+    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class OrderCancelParam {
+
+    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("1:弹窗1  2：弹窗取消未拉运吨数 3：取消未拉运+已到达货源地之前的吨数")
+    private Integer cancelType;
+
+    @ApiModelProperty("1:平台  2：货主")
+    private Integer createByType;
+
+    @ApiModelProperty("取消原因")
+    private String cancelReason;
+
+    private List<String> childNoList;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderChildCancelRecordParam extends PageParam {
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildReportParam {
+
+    @ApiModelProperty(value = "发货地址id 必填")
+    @NotNull(message = "发货地址id不能为空")
+    private Integer sendAddressId;
+
+    @ApiModelProperty(value = "收货地址id 必填")
+    @NotNull(message = "收货地址id不能为空")
+    private Integer receiveAddressId;
+
+    @ApiModelProperty(value = "开始时间 必填")
+    @NotNull(message = "开始时间")
+    private String beginTime;
+}

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+@Getter
+@Setter
+public class OrderGoodsCancelParam {
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @NotNull(message = "货单编号不能为空")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("货单取消类型 1：弹窗1  2：取消未接单及未到达货源地的车辆 3：取消未接单及未装车的车辆")
+    private Integer cancelOperateType;
+
+    @ApiModelProperty("取消的车辆列表")
+    private List<String> truckList;
+
+    @ApiModelProperty("取消原因")
+    private String cancelReason;
+}

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -12,39 +14,56 @@ import java.util.List;
 @Setter
 public class OrderGoodsChildParams {
 
-    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    @ApiModelProperty(value = "用车方式 1：平台车辆配货 2：自有车辆配货", required = true)
     private String vehicleUsage;
 
-
+    @NotNull(message = "挂单运费不能为空")
     @MoneyInConvert
-    @ApiModelProperty("挂单运费")
+    @ApiModelProperty(value = "挂单运费", required = true)
     private BigDecimal pendingOrderFreight;
 
-    @ApiModelProperty("提取方式 1提取全部 2提取部分")
+    @NotNull(message = "提取方式不能为空")
+    @ApiModelProperty(value = "提取方式 1提取全部 2提取部分", required = true)
     private Integer extractWay;
 
-    @ApiModelProperty("提取吨数")
+    @NotNull(message = "提取吨数不能为空")
+    @ApiModelProperty(value = "提取吨数", required = true)
     private BigDecimal extractWeight;
 
-
-    @ApiModelProperty("需要车辆/辆")
+    @ApiModelProperty(value = "需要车辆/辆", required = true)
     private Integer needTruckNum;
 
-
-    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
+    @NotNull(message = "提取吨数不能为空")
+    @ApiModelProperty(value = "挂单方式  1公开派单  2定向派单" , required = true)
     private Integer pendingOrderWay;
 
-    @ApiModelProperty(value = "最晚到达货源地时间/运单的最晚装货时间", example = "2023-09-09 12:00:01", required = true)
+    @NotBlank(message = "最晚接单时间不能为空")
+    @ApiModelProperty(value = "最晚接单时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastOrderTime;
+
+    @NotBlank(message = "最晚到达货源地时间不能为空")
+    @ApiModelProperty(value = "最晚到达货源地时间", example = "2023-09-09 12:00:01", required = true)
     private String lastArriveSendTime;
 
+    @NotBlank(message = "最晚装货时间不能为空")
+    @ApiModelProperty(value = "最晚装货时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastLoadTime;
+
+    @NotBlank(message = "最晚到达目的地时间不能为空")
+    @ApiModelProperty(value = "最晚到达目的地时间", example = "2023-09-09 12:00:01", required = true)
+    private String lastArriveReceiveTime;
+
+
+    @NotBlank(message = "挂单时间不能为空")
     @ApiModelProperty(value = "挂单时间", example = "2023-09-09 12:00:01", required = true)
     private String pendingOrderTime;
 
-
-    @ApiModelProperty("高级物流经理id")
+    @NotNull(message = "高级物流经理id不能为空")
+    @ApiModelProperty(value = "高级物流经理id" , required = true)
     private Integer seniorLogisticsManagerId;
 
-    @ApiModelProperty("高级物流经理姓名")
+    @NotBlank(message = "高级物流经理姓名能为空")
+    @ApiModelProperty(value = "高级物流经理姓名" , required = true)
     private String seniorLogisticsManagerName;
 
 

performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsEditParams.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.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderGoodsEditParams {
+
+    private Integer id;
+
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    private Integer vehicleUsage;
+
+    @ApiModelProperty("提取吨数")
+    private BigDecimal extractWeight;
+
+    @ApiModelProperty("剩余拉运吨数")
+    private BigDecimal residueTransportWeight;
+
+    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
+    private Integer pendingOrderWay;
+
+    @ApiModelProperty("'最晚接单时间'")
+    private String lastOrderTime;
+    
+    @ApiModelProperty("最晚到达货源地时间")
+    private String lastArriveSendTime;
+
+    @ApiModelProperty("最晚装货时间")
+    private String lastLoadTime;
+
+    @ApiModelProperty("最晚到达目的地时间")
+    private String lastArriveReceiveTime;
+
+    @ApiModelProperty("挂单时间")
+    private String pendingOrderTime;
+    
+    @ApiModelProperty("提取方式 1提取全部 2提取部分")
+    private Integer extractWay;
+
+    @ApiModelProperty("需要车辆/辆")
+    private Integer needTruckNum;
+
+    @ApiModelProperty("挂单运费")
+    @MoneyInConvert
+    private BigDecimal pendingOrderFreight;
+
+    @ApiModelProperty("创建人用户编号")
+    private Long userNo;
+
+    @ApiModelProperty("创建人姓名")
+    private String userName;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+    @ApiModelProperty("车辆列表")
+    private List<String> truckList;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ClassName OrderGoodsLogParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/26 16:18
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class OrderGoodsLogParam extends PageParam {
+
+    @NotBlank(message = "货单编号不能为空")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+}

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

@@ -4,6 +4,7 @@ import com.msl.common.convertor.field.Converted;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
@@ -14,6 +15,7 @@ public class OrderGoodsParams {
     @NotBlank(message = "订单编号不能为空")
     private String orderNo;
 
+    @Valid
     @Converted(isDynamic = true)
     private List<OrderGoodsChildParams> orderGoodsChildParams;
 }

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ClassName OrderGoodsTruckListParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/25 20:13
+ * @Version 1.0
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderGoodsTruckListParam {
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    @NotBlank(message = "货单编号不能为空")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+}

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

@@ -33,4 +33,5 @@ public class PageOrderGoodsListParam extends PageParam {
     @ApiModelProperty(value = "用车类型： 1平台车辆 2部分平台车辆 3自有车辆")
     private Integer truckDemand;
 
+
 }

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

@@ -16,6 +16,9 @@ public class PageOwnerAccountListParam extends PageParam {
     @ApiModelProperty(value = "货主编码")
     private String ownerUserNo;
 
+    @ApiModelProperty(value = "货主姓名")
+    private String ownerUserName;
+
     @ApiModelProperty(value = "联系电话")
     private String mobile;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -20,6 +21,7 @@ public class PageTruckListParam extends PageParam {
 
     @NotNull(message = "需要车数不能为空")
     @ApiModelProperty(value = "需要车辆数量", example = "5")
+    @Min(value = 1,message = "需要车数最小为1")
     private Integer needTruckNum;
     @ApiModelProperty(value = "空重车状态 1:空车 2:运单-空车 3:运单-重车", example = "1")
     private Integer truckUserStatus;

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ClassName TruckTraceParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/11/13 9:47
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TruckTraceParam {
+
+    @NotBlank(message = "车牌号不能为空")
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+    @NotBlank(message = "开始时间不能为空")
+    @ApiModelProperty(value = "开始时间",example = "2023-11-11 12:00:00")
+    private String beginTime;
+    @NotBlank(message = "结束时间不能为空")
+    @ApiModelProperty(value = "结束时间",example = "2023-11-11 12:00:00")
+    private String endTime;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.field.Converted;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @ClassName UpdateEditOrderGoodsParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/25 16:41
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class UpdateEditOrderGoodsParam {
+
+    @ApiModelProperty("订单编号")
+    @NotBlank(message = "订单编号不能为空")
+    private String orderNo;
+
+    @Valid
+    @Converted(isDynamic = true)
+    private OrderGoodsEditParams orderGoodsParams;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @ClassName UpdateOrderGoodsPriceParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/26 10:30
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class UpdateOrderGoodsPriceParam {
+
+    @NotNull(message = "货单id不能为空")
+    @ApiModelProperty("货单id")
+    private Integer id;
+
+
+    @NotNull(message = "挂单运费不能为空")
+    @ApiModelProperty("挂单运费")
+    @MoneyInConvert
+    private BigDecimal pendingOrderFreight;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/BreakContractDriveRuleUpdateParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRuleVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.Valid;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriveRuleUpdateParam {
+
+    @Valid
+    @ApiModelProperty(value = "司机取消规则")
+    private BreakContractDriverRuleVO.DriverCancelRule driverCancelRule;
+
+    @Valid
+    @ApiModelProperty(value = "货源地超时规则")
+    private BreakContractDriverRuleVO.SendAddressRule sendAddressRule;
+
+    @Valid
+    @ApiModelProperty(value = "目的地超时规则")
+    private BreakContractDriverRuleVO.ReceiveAddressRule receiveAddressRule;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/BreakContractDriverRecordAddParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriverRecordAddParam {
+
+    @ApiModelProperty("违约方类型：1平台 3司机")
+    @NotNull(message = "违约方类型不能为空")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约运单")
+    @NotBlank(message = "违约运单不能为空")
+    private String childNo;
+
+    @ApiModelProperty("违约金")
+    @NotNull(message = "违约金不能为空")
+    @Max(value = 999_999_999L, message = "金额不能超过999999999元")
+    @Min(value = 0L, message = "金额不能小于0元")
+    @MoneyInConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("接单时间限制（小时）")
+    private BigDecimal timeLimit;
+
+    @ApiModelProperty("备注")
+    @NotBlank(message = "违约原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/BreakContractOwnerRecordAddParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRecordAddParam {
+
+    @ApiModelProperty("违约方类型：1平台 2货主")
+    @NotNull(message = "违约方类型不能为空")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约订单")
+    @NotBlank(message = "违约订单不能为空")
+    private String orderNo;
+
+    @ApiModelProperty("违约金")
+    @NotNull(message = "违约金不能为空")
+    @Max(value = 999_999_999L, message = "金额不能超过999999999元")
+    @Min(value = 0L, message = "金额不能小于0元")
+    @MoneyInConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("备注")
+    @NotBlank(message = "违约原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/BreakContractOwnerRuleAddParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRuleAddParam {
+
+    @ApiModelProperty(value = "违约方案名称", example = "方案1")
+    @NotNull(message = "违约方案名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "自动规则")
+    private Map<String, String> rule;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/BreakContractOwnerRuleStatusUpdateParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRuleStatusUpdateParam {
+
+    @ApiModelProperty(value = "id", example = "1")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "1")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierBreakContractSavePayeeParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+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;
+import javax.validation.constraints.Size;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakContractSavePayeeParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+    @NotBlank(message = "收款人不能为空")
+    @Size(max=64,message = "收款人最多输入64个字符")
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @NotBlank(message = "收款银行不能为空")
+    @Size(max=64,message = "收款银行最多输入64个字符")
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @NotBlank(message = "收款银行卡卡号不能为空")
+    @Size(max=32,message = "收款银行卡卡号最多输入32个字符")
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @NotBlank(message = "付款凭证不能为空")
+    @Size(max=255,message = "付款凭证最多输入255个字符")
+    @ApiModelProperty(value = "付款凭证", example = "/a.png")
+    private String paymentImg;
+
+    @NotBlank(message = "付款银行不能为空")
+    @Size(max=64,message = "付款银行最多输入64个字符")
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @NotBlank(message = "付款银行卡卡号不能为空")
+    @Size(max=32,message = "付款银行卡卡号最多输入32个字符")
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
+    @ApiModelProperty(value = "状态", example = "1",hidden = true)
+    private Integer status;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierBreakPayeeConfirmParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakPayeeConfirmParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierCancelSettlementParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierCancelSettlementParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierUploadInvoiceImgParam.java

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+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;
+import javax.validation.constraints.Size;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierUploadInvoiceImgParam  {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+    @NotBlank(message = "结算凭证不能为空")
+    @Size(max=255,message = "结算凭证最多输入255个字符")
+    @ApiModelProperty(value="结算凭证",example = "/123.img")
+    private String invoiceImg;
+
+}