Merge branch 'v5.7_break_contract_reverse_20231020' into test

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);
+        }
+    }
+
+
+}

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/OrderChildEnum.java

@@ -85,6 +85,28 @@ public enum OrderChildEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum CancelType {
+        PERSONAL(1, "个人原因"),
+        PRICE(2, "价格不合适"),
+        LOAD(3, "无法装货"),
+        TRUCK(4, "车辆原因"),
+        TRAFFIC_RESTRICTION(5, "交通管制"),
+        TRAFFIC_ACCIDENT(6, "交通事故"),
+        ADDRESS(7, "无法找到地址"),
+        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(),

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/PerformanceResultEnum.java

@@ -33,7 +33,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     DATA_REPEAT(1106, "数据重复"),
 
 
-    ORDER_NO_FOUND(1200, "货单不存在"),
+    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, "非卸车时间段"),
@@ -73,6 +74,12 @@ public enum PerformanceResultEnum implements ResultEnum {
     INTEGRAL_ORDER_NO_EXIST(1402, "货单不存在"),
     INTEGRAL_TRUCK_NO_EXIST(1403, "车辆不存在"),
 
+    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, "货主提现金额和平台支付金额不一致"),

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/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 {
+
+        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/feign/PerformanceFeign.java

 package com.clx.performance.feign;
 
+import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
+import com.clx.performance.param.pc.OrderCancelFeignParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.param.pc.owner.UpdateStatusParam;
@@ -54,6 +56,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 +81,7 @@ 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);
 }

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/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/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/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;
+
+@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;
+}

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 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("挂单运费")
+    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/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.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 = "违约金不能为空")
+    @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.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 = "违约金不能为空")
+    @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.NotNull;
+import javax.validation.constraints.Size;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class CarrierUploadInvoiceImgParam  {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+    @NotNull(message = "结算凭证不能为空")
+    @Size(max=255,message = "结算凭证最多输入255个字符")
+    @ApiModelProperty(value="结算凭证",example = "/123.img")
+    private String invoiceImg;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/OwnerConfirmSettlementParam.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 OwnerConfirmSettlementParam {
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty(value = "id", example = "100")
+    private Integer id;
+
+}

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+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 PageBreakContractDriverRecordParam extends PageParam {
+
+    @ApiModelProperty(value = "运单", example = "1000000000")
+    private String childNo;
+
+    @ApiModelProperty("触发类型：1系统触发 2手动触发")
+    private Integer triggerType;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty(value = "开始时间", example = "")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "")
+    private String endTime;
+}
\ No newline at end of file

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+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 PageBreakContractOwnerRecordParam extends PageParam {
+
+    @ApiModelProperty(value = "订单号", example = "1000000000")
+    private String orderNo;
+
+    @ApiModelProperty("触发类型：1系统触发 2手动触发")
+    private Integer triggerType;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty(value = "开始时间", example = "")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "")
+    private String endTime;
+}

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+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 PageBreakContractOwnerRuleParam extends PageParam {
+
+    @ApiModelProperty(value = "方案名称", example = "方案1")
+    private String name;
+
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "开始时间", example = "")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "")
+    private String endTime;
+}
\ No newline at end of file

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementDriverDetailParam extends PageParam {
+
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="车主编号",example = "201457878")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
+    private Integer breakContractPartyType;
+
+}

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementDriverParam extends PageParam {
+
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="结算单号",example = "201457878")
+    private String settlementNo;
+
+    @ApiModelProperty(value="车主编号",example = "201457878")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private Integer settleStatus;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
+    private String beginTime;
+
+    @ApiModelProperty(value="结束时间",example = "2012-01-01 00:00:00")
+    private String endTime;
+
+}

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementOwnerDetailParam extends PageParam {
+
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+    @ApiModelProperty(value="货主编号",example = "201457878")
+    private Long ownerUserNo;
+
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
+    private Integer breakContractPartyType;
+
+}

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

+package com.clx.performance.param.pc.breakcontract.carrier;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
+
+    @ApiModelProperty(value="货主编号",example = "201457878")
+    private Long ownerUserNo;
+
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
+    @ApiModelProperty(value="订单编号",example = "201457878")
+    private String orderNo;
+
+    @ApiModelProperty(value="结算单号",example = "201457878")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty(value = "状态：10-待对账,20-待货主确认,30-待货主付款,40-待平台确认付款,50-待平台付款,60-待货主确认付款,70-已完结,80-已取消", example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
+    private String beginTime;
+
+    @ApiModelProperty(value="结束时间",example = "2012-01-01 00:00:00")
+    private String endTime;
+
+}

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

+package com.clx.performance.param.pc.breakcontract.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageOwnerBreakContractOwnerRecordParam extends PageParam {
+
+    @ApiModelProperty(value = "货主编号", example = "1",hidden = true)
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "订单号", example = "1000000000")
+    private String orderNo;
+
+    @NotNull(message = "违约方类型不能为空")
+    @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费/赔付状态：0未赔付;1已赔付", example = "1")
+    private Integer payStatus;
+
+    @ApiModelProperty(value = "开始时间", example = "2012-01-01 00:00:00")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "2012-01-01 00:00:00")
+    private String endTime;
+}

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

@@ -108,8 +108,12 @@ public class OrderChildVO {
     @MoneyOutConvert
     private BigDecimal orderFreightPrice;
 
+    @ApiModelProperty(value = "取消原因", example = "取消原因类型：1个人原因, 2价格不合适, 3无法装货, 4车辆原因, 5交通管制, 6交通事故, 7无法找到地址, 8排队时间较长, 9其他原因")
+    private Integer cancelType;
     @ApiModelProperty(value = "取消原因", example = "抢错了")
     private String cancelRemark;
+    @ApiModelProperty(value = "司机取消详细原因", example = "司机取消详细原因")
+    private String cancelDetail;
     @ApiModelProperty(value = "磅单审核状态 0 待审核 1 审核通过 2 审核驳回", example = "0")
     private Integer poundStatus;
     @ApiModelProperty(value = "磅单审核驳回原因", example = "交货信息错误")

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

+package com.clx.performance.vo.app.breakcontract;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class DriverBreakContractDriverRecordVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("触发类型：1系统触发 2手动触发")
+    private Integer triggerType;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约运单")
+    private String childNo;
+
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机用户编号")
+    private Long driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("违约金")
+    @MoneyOutConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("接单时间限制（小时）")
+    private BigDecimal timeLimit;
+
+    @ApiModelProperty("接单限制时间")
+    private String limitTime;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+}

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

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

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

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

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

@@ -79,9 +79,12 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
     private BigDecimal unloadNet;
 
-
+    @ApiModelProperty(value = "取消原因", example = "取消原因类型：1个人原因, 2价格不合适, 3无法装货, 4车辆原因, 5交通管制, 6交通事故, 7无法找到地址, 8排队时间较长, 9其他原因")
+    private Integer cancelType;
     @ApiModelProperty(value = "取消原因", example = "抢错了")
     private String cancelRemark;
+    @ApiModelProperty(value = "司机取消详细原因", example = "司机取消详细原因")
+    private String cancelDetail;
 
     @ApiModelProperty(value = "状态", example = "0")
     private Integer status;

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderGoodsEditVO {
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    @ApiModelProperty("拉运结束时间")
+    private String transportEndTime;
+    @ApiModelProperty("拉运吨数")
+    private BigDecimal transportWeight;
+    @ApiModelProperty("有效运费")
+    private BigDecimal validFreightPrice;
+    @ApiModelProperty("用车需求： 1平台车辆 2部分平台车辆 3自有车辆")
+    private Integer truckDemand;
+    @ApiModelProperty("剩余拉运吨数")
+    private String residueWeight;
+    @ApiModelProperty("自有承运吨数")
+    private String ownCarryWeight;
+    @ApiModelProperty("自有承运剩余吨数")
+    private String ownResidueCarryWeight;
+    @ApiModelProperty("平台承运吨数")
+    private String platformCarryWeight;
+    @ApiModelProperty("平台剩余承运吨数")
+    private String platformResidueCarryWeight;
+    @ApiModelProperty("向下浮动量（吨）")
+    private String downFloatWeight;
+    @ApiModelProperty("向上浮动量（吨）")
+    private String upFloatWeight;
+    @ApiModelProperty("是否暂停 0：否   1：是")
+    private Integer stopFlag;
+    @ApiModelProperty("结算账期  1拉运完成结  2月结")
+    private Integer settlementAccountPeriod;
+    @ApiModelProperty("1:可以全部编辑 0：不能全部编辑")
+    private boolean editAllFlag;
+
+    private OrderGoodsVO orderGoodsVO;
+}

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName OrderGoodsLogVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/26 16:11
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class OrderGoodsLogVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    
+    @ApiModelProperty("货单编码")
+    private String orderGoodsNo;
+
+    
+    @ApiModelProperty("操作人ID")
+    private Long createBy;
+
+    
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    
+    @ApiModelProperty("操作类型")
+    private String type;
+
+    
+    @ApiModelProperty("备注")
+    private String remark;
+
+    
+    @ApiModelProperty("创建时间")
+    private String createTime;
+}

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @ClassName SeniorLogisticsManagerVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/9/18 19:51
+ * @Version 1.0
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OrderGoodsTruckListVO {
+
+
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+
+    @ApiModelProperty(value = "空重车状态 1:空车 2:运单-空车 3:运单-重车", example = "1")
+    private Integer truckUseStatus;
+
+    @ApiModelProperty(value = "车辆等级", example = "A")
+    private String truckLevel;
+
+    @ApiModelProperty(value = "距货源地", example = "20")
+    private Double maxDistance;
+
+
+    @ApiModelProperty(value = "接单状态  0：未接单  1：已接单", example = "0")
+    private Integer orderedStatus;
+
+}

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

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -15,6 +16,9 @@ import java.util.List;
 @NoArgsConstructor
 public class OrderGoodsVO {
 
+    @ApiModelProperty("货单id")
+    private Integer id;
+
     @ApiModelProperty("订单编号")
     private String orderNo;
 
@@ -109,5 +113,23 @@ public class OrderGoodsVO {
     @ApiModelProperty("车辆列表")
     private List<String> truckList;
 
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("'最晚到达目的地时间'")
+    private String lastArriveReceiveTime;
+
+    @ApiModelProperty("最晚装货时间")
+    private String lastLoadTime;
+
+    @ApiModelProperty("'最晚接单时间'")
+    private String lastOrderTime;
+
+    @ApiModelProperty("是否暂停 0：否   1：是")
+    private Integer stopFlag;
+    @ApiModelProperty("结算账期  1拉运完成结  2月结")
+    private Integer settlementAccountPeriod;
 
+    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    private Integer vehicleUsage;
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractDriverRecordVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriverRecordVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("触发类型：1系统触发 2手动触发")
+    private Integer triggerType;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约运单")
+    private String childNo;
+
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机用户编号")
+    private Long driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("违约金")
+    @MoneyOutConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("接单时间限制（小时）")
+    private BigDecimal timeLimit;
+
+    @ApiModelProperty("接单限制时间")
+    private String limitTime;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractDriverRuleVO.java

+package com.clx.performance.vo.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.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriverRuleVO {
+
+    @ApiModelProperty(value = "司机取消规则")
+    private DriverCancelRule driverCancelRule;
+
+    @ApiModelProperty(value = "货源地超时规则")
+    private SendAddressRule sendAddressRule;
+
+    @ApiModelProperty(value = "目的地超时规则")
+    private ReceiveAddressRule receiveAddressRule;
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class DriverCancelRule{
+
+        @ApiModelProperty("接单时间小于X小时")
+        @NotNull(message = "参数不能为空")
+        private BigDecimal baseTime;
+
+        @ApiModelProperty("收费X元")
+        @NotNull(message = "参数不能为空")
+        private BigDecimal baseFigure;
+
+        @ApiModelProperty("每小时加收X元")
+        @NotNull(message = "参数不能为空")
+        private BigDecimal figurePerHour;
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class SendAddressRule{
+        @ApiModelProperty("每小时收X元")
+        @NotNull(message = "参数不能为空")
+        private BigDecimal figurePerHour;
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class ReceiveAddressRule{
+        @ApiModelProperty("每小时每吨收X元")
+        @NotNull(message = "参数不能为空")
+        private BigDecimal figurePerHour;
+    }
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRecordVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRecordVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("触发类型：1系统触发 2手动触发")
+    private Integer triggerType;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约订单")
+    private String orderNo;
+
+    @ApiModelProperty("违约金（分）")
+    @MoneyOutConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRuleFileVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRuleFileVO {
+    @ApiModelProperty(value = "id", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "违约方案名称", example = "方案1")
+    private String name;
+
+    @ApiModelProperty(value = "违约方案文件", example = "url")
+    private String file;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRulePullDownVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRulePullDownVO {
+    @ApiModelProperty(value = "id", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "违约方案名称", example = "方案1")
+    private String name;
+
+    @ApiModelProperty(value = "违约方案文件", example = "url")
+    private String file;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRuleVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRuleVO {
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty(value = "违约方案名称", example = "方案1")
+    private String name;
+
+    @ApiModelProperty(value = "违约方案文件", example = "url")
+    private String file;
+
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "1")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+    @ApiModelProperty(value = "自动规则")
+    private Map<String, String> rule;
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class AutoRule{
+
+        @ApiModelProperty(value = "订单吨数减少")
+        private OrderAmountReduceRule orderAmountReduceRule;
+        @ApiModelProperty(value = "订单取消")
+        private OrderCancelRule orderCancelRule;
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class ManualRule{
+
+        private Integer id;
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderAmountReduceRule {
+        @ApiModelProperty(value = "挂单前：总运费*X%", example = "1.23")
+        private BigDecimal beforeRatio;
+        @ApiModelProperty(value = "挂单后：总运费*X%", example = "1.23")
+        private BigDecimal afterRatio;
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class OrderCancelRule {
+        @ApiModelProperty(value = "挂单前，总运费*X%", example = "1.23")
+        private BigDecimal beforeRatio;
+        @ApiModelProperty(value = "挂单后，总运费*X%", example = "1.23")
+        private BigDecimal afterRatio;
+        @ApiModelProperty(value = "挂单后，车辆违约金X元/小时.车", example = "1.23")
+        private BigDecimal afterFigurePerHour;
+    }
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierBreakContractSettlementDriverDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakContractSettlementDriverDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金（分）")
+    private BigDecimal figure;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private String settleStatusMsg;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private Integer settleStatus;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private String settlePlatformMsg;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private Integer settlePlatform;
+
+    @ApiModelProperty("结算时间")
+    private String settleTime;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierBreakContractSettlementLogVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakContractSettlementLogVO {
+
+
+    @ApiModelProperty("内容")
+    private String remark;
+
+    @ApiModelProperty("操作人类型1-货主， 2-承运端，3-司机")
+    private Integer createType;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakContractSettlementOwnerDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("结算单号")
+    private String settlementNo;
+
+    @ApiModelProperty("货主用户编号")
+    private Long ownerUserNo;
+
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("状态msg")
+    private String statusMsg;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("结算凭证")
+    private String invoiceImg;
+
+    @ApiModelProperty("收款人")
+    private String payee;
+
+    @ApiModelProperty("收款银行")
+    private String payeeBankName;
+
+    @ApiModelProperty("收款银行卡卡号")
+    private String payeeBankCardNo;
+
+    @ApiModelProperty("付款凭证")
+    private String paymentImg;
+
+    @ApiModelProperty("付款银行")
+    private String paymentBankName;
+
+    @ApiModelProperty("付款银行卡卡号")
+    private String paymentBankCardNo;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("操作日志")
+    private List<CarrierBreakContractSettlementLogVO> logs;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementDriverDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("违约单号")
+    private String breakNo;
+
+    @ApiModelProperty("结算单号")
+    private String settlementNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementDriverVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金（分）")
+    private BigDecimal figure;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private String settleStatusMsg;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private Integer settleStatus;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private String settlePlatformMsg;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private Integer settlePlatform;
+
+    @ApiModelProperty("结算时间")
+    private String settleTime;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementOwnerDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("违约单号")
+    private String breakNo;
+
+    @ApiModelProperty("结算单号")
+    private String settlementNo;
+
+    @ApiModelProperty("货主用户编号")
+    private Long ownerUserNo;
+
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageCarrierBreakContractSettlementOwnerVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("结算单号")
+    private String settlementNo;
+
+    @ApiModelProperty("货主用户编号")
+    private Long ownerUserNo;
+
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("状态msg")
+    private String statusMsg;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/owner/CarrierOrderChildDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.owner;
+
+import com.clx.performance.vo.pc.OrderChildLogVO;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierOrderChildDetailVO {
+
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "货物名称", example = "煤")
+    private String goodsName;
+
+    @ApiModelProperty(value = "运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value = "应付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal payableFreight;
+
+    @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossDeduction;
+
+    @ApiModelProperty(value = "实付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal realFreight;
+
+
+    @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value = "订单运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal orderFreightPrice;
+
+    @ApiModelProperty("货物重量")
+    private BigDecimal extractWeight;
+
+    @ApiModelProperty(value = "发货地址", example = "朝阳")
+    private String sendAddress;
+
+    @ApiModelProperty(value = "收货地址", example = "西城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    private String truckNo;
+
+    @ApiModelProperty(value = "司机姓名", example = "张三")
+    private String driverName;
+
+    @ApiModelProperty(value = "司机手机号", example = "130000000")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    private BigDecimal unloadNet;
+
+
+    @ApiModelProperty(value = "取消原因", example = "抢错了")
+    private String cancelRemark;
+
+    @ApiModelProperty(value = "状态", example = "0")
+    private Integer status;
+
+    @ApiModelProperty(value = "装车磅单图片列表")
+    private List<String> loadImageList;
+
+    @ApiModelProperty(value = "卸车磅单图片列表")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "流程节点")
+    private List<OrderChildLogVO> childLogs;
+
+    @ApiModelProperty(value = "磅单审核列表")
+    private List<OrderChildPoundAuditDetailVO> poundAudits;
+
+    @ApiModelProperty(value = "完成时间", example = "2020-01-01 10:10:10")
+    private String finishTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/owner/PageOwnerBreakContractOwnerRecordVO.java

+package com.clx.performance.vo.pc.breakcontract.owner;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liruixin
+ * Date 2023-10-24
+ * Time 16:02
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PageOwnerBreakContractOwnerRecordVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约订单")
+    private String orderNo;
+
+    @ApiModelProperty("违约金")
+    @MoneyOutConvert
+    private BigDecimal figure;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("缴费状态：0未缴费;1已缴费")
+    private String payStatusMsg;
+
+    @ApiModelProperty("赔付状态：0未赔付;1已赔付")
+    private String compensationStatusMsg;
+
+    @ApiModelProperty("缴费状态：0未缴费;1已缴费 /赔付状态：0未赔付;1已赔付")
+    private Integer payStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("违约时间")
+    private String createTime;
+
+    @ApiModelProperty("赔付时间")
+    private String payTime;
+
+}

performance-web/pom.xml

@@ -55,6 +55,11 @@
             <artifactId>user-sdk</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.msl</groupId>
+            <artifactId>document-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.msl</groupId>
             <artifactId>msl-esign-v3-sdk</artifactId>

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

@@ -31,7 +31,8 @@ public class GoodsOrderTruckRecordComponent {
 
     //删除货单下的所有车牌号
     public void deleteTruckRecord(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
+        redisTemplate.delete(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
+        //redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo,);
         redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_RECORD, orderGoodsNo);
     }
 

performance-web/src/main/java/com/clx/performance/component/IdGenerateSnowFlake.java

@@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicLong;
  * datacenterId：根据服务的ip地址区分，当前最多支持32太机器
  * channelConfTypeId： 用于区分不同渠道的消息标示 用了6位的二进制位标示
  * 从17位~23位 可看当前消息类型
- * channelConfType ： 1:充值  2：外呼 3:push
  */
 @Component
 public class IdGenerateSnowFlake implements InitializingBean {

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

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "break.contract")
+@Getter
+@Setter
+public class BreakContractConfig {
+    private Long templateNo;
+}

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

@@ -144,4 +144,30 @@ public class RabbitBeanConfig {
     public Binding orderGoodsDeadExchangeBind() {
         return BindingBuilder.bind(orderGoodsOnDeadQueue()).to(orderGoodsOnDeadExchange()).with(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
     }
+
+
+    /**
+     * 订单取消队列
+     * @return
+     */
+    @Bean
+    public Queue orderCancelQueue() {
+        return new Queue(RabbitKeyConstants.ORDER_CANCEL_QUEUE, true, false, false);
+    }
+
+    /**
+     * 订单取消队列交换机
+     **/
+    @Bean
+    public DirectExchange orderCancelExchange() {
+        return new DirectExchange(RabbitKeyConstants.ORDER_CANCEL_EXCHANGE);
+    }
+
+    /**
+     * 订单取消队列绑定
+     */
+    @Bean
+    public Binding orderCancelExchangeBind() {
+        return BindingBuilder.bind(orderCancelQueue()).to(orderCancelExchange()).with(RabbitKeyConstants.ORDER_CANCEL_ROUTE_KEY);
+    }
 }

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

+package com.clx.performance.config;
+
+import com.clx.performance.constant.RabbitKeyBreakContractConstants;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 违约 MQ
+ * @Date: 2023-10-12 16:27:30
+ * @Version: 1.0
+ */
+@Configuration
+public class RabbitBreakContractConfig {
+
+    @Bean
+    public DirectExchange breakContractDefaultExchange() {
+        return new DirectExchange(RabbitKeyBreakContractConstants.DEFAULT_EXCHANGE);
+    }
+
+    @Bean
+    public Queue breakContractDefaultDelayQueue() {
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("x-message-ttl", 15 * 60 * 1000);
+        params.put("x-max-length", 5000000);
+        params.put("x-dead-letter-exchange", RabbitKeyBreakContractConstants.DEFAULT_EXCHANGE);
+        params.put("x-dead-letter-routing-key", RabbitKeyBreakContractConstants.DEFAULT_DEAD_ROUTING_KEY);
+        return new Queue(RabbitKeyBreakContractConstants.DEFAULT_DELAY_QUEUE, true, false, false, params);
+    }
+    @Bean
+    public Binding breakContractDefaultDelayQueueBinding() {
+        return BindingBuilder.bind(breakContractDefaultDelayQueue()).to(breakContractDefaultExchange()).with(RabbitKeyBreakContractConstants.DEFAULT_DELAY_ROUTING_KEY);
+    }
+
+    @Bean
+    public Queue breakContractDefaultDeadQueue() {
+        return new Queue(RabbitKeyBreakContractConstants.DEFAULT_DEAD_QUEUE);
+    }
+    @Bean
+    public Binding breakContractDefaultDeadQueueBinding() {
+        return BindingBuilder.bind(breakContractDefaultDeadQueue()).to(breakContractDefaultExchange()).with(RabbitKeyBreakContractConstants.DEFAULT_DEAD_ROUTING_KEY);
+    }
+
+
+    /**
+     * 货主规则新增
+     */
+    @Bean
+    public Queue breakContractOwnerRuleAddQueue() {
+        return new Queue(RabbitKeyBreakContractConstants.OWNER_RULE_ADD_QUEUE);
+    }
+    @Bean
+    public Binding breakContractOwnerRuleAddQueueBinding() {
+        return BindingBuilder.bind(breakContractOwnerRuleAddQueue()).to(breakContractDefaultExchange()).with(RabbitKeyBreakContractConstants.OWNER_RULE_ADD_ROUTING_KEY);
+    }
+
+    /**
+     * 司机违约记录新增
+     */
+    @Bean
+    public Queue breakContractDriverRecordAddQueue() {
+        return new Queue(RabbitKeyBreakContractConstants.DRIVER_RECORD_ADD_QUEUE);
+    }
+    @Bean
+    public Binding breakContractDriverRecordAddQueueBinding() {
+        return BindingBuilder.bind(breakContractDriverRecordAddQueue()).to(breakContractDefaultExchange()).with(RabbitKeyBreakContractConstants.DRIVER_RECORD_ADD_ROUTING_KEY);
+    }
+
+}

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

@@ -61,6 +61,30 @@ public class RabbitOrderChildConfig {
         return BindingBuilder.bind(orderChildAddQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_ADD_ROUTING_KEY);
     }
 
+    /**
+     * 到达货源地
+     */
+    @Bean
+    public Queue orderChildArriveSendAddressQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_ARRIVE_SEND_ADDRESS_QUEUE);
+    }
+    @Bean
+    public Binding orderChildArriveSendAddressQueueBinding() {
+        return BindingBuilder.bind(orderChildArriveSendAddressQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_ARRIVE_SEND_ADDRESS_ROUTING_KEY);
+    }
+
+    /**
+     * 到达目的地
+     */
+    @Bean
+    public Queue orderChildArriveReceiveAddressQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_QUEUE);
+    }
+    @Bean
+    public Binding orderChildArriveReceiveAddressQueueBinding() {
+        return BindingBuilder.bind(orderChildArriveReceiveAddressQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_ROUTING_KEY);
+    }
+
     /**
      * 司机确认收货
      */
@@ -73,5 +97,16 @@ public class RabbitOrderChildConfig {
         return BindingBuilder.bind(orderChildDriverConfirmQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_DRIVER_CONFIRM_ROUTING_KEY);
     }
 
+    /**
+     * 运单取消
+     */
+    @Bean
+    public Queue orderChildCancelQueue() {
+        return new Queue(RabbitKeyOrderChildConstants.ORDER_CHILD_CANCEL_QUEUE);
+    }
+    @Bean
+    public Binding orderChildCancelQueueBinding() {
+        return BindingBuilder.bind(orderChildCancelQueue()).to(orderChildDefaultExchange()).with(RabbitKeyOrderChildConstants.ORDER_CHILD_CANCEL_ROUTING_KEY);
+    }
 
 }

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

+package com.clx.performance.constant;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 违约-mq
+ * @Date: 2023-10-12 15:27:23
+ * @Version: 1.0
+ */
+public class RabbitKeyBreakContractConstants {
+
+    private static final String PREFIX = "clx-performance.breakContract.";
+    private static final String EXCHANGE = ".exchange";
+    private static final String QUEUE = ".queue";
+    private static final String QUEUE_ROUTING_KEY = ".routing.key";
+    private static final String DELAY_QUEUE = ".delay.queue";
+    private static final String DELAY_ROUTING_KEY = ".delay.routing.key";
+    private static final String DEAD_QUEUE = ".dead.queue";
+    private static final String DEAD_ROUTING_KEY = ".dead.routing.key";
+
+    private RabbitKeyBreakContractConstants() {
+    }
+
+    /**
+     * 缺省交换机
+     */
+    public static final String DEFAULT_EXCHANGE = PREFIX +"default"+EXCHANGE;
+
+    /**
+     * 缺省延迟队列
+     */
+    public static final String DEFAULT_DELAY_QUEUE = PREFIX +"default"+DELAY_QUEUE;
+    public static final String DEFAULT_DELAY_ROUTING_KEY = PREFIX +"default"+DELAY_ROUTING_KEY;
+    public static final String DEFAULT_DEAD_QUEUE = PREFIX +"default"+DEAD_QUEUE;
+    public static final String DEFAULT_DEAD_ROUTING_KEY = PREFIX +"default"+DEAD_ROUTING_KEY;
+
+    /**
+     * 新增货主违约规则
+     */
+    public static final String OWNER_RULE_ADD_QUEUE = PREFIX +"ownerRule.add"+QUEUE;
+    public static final String OWNER_RULE_ADD_ROUTING_KEY = PREFIX +"ownerRule.add"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 司机违约记录新增
+     */
+    public static final String DRIVER_RECORD_ADD_QUEUE = PREFIX +"driverRecord.add"+QUEUE;
+    public static final String DRIVER_RECORD_ADD_ROUTING_KEY = PREFIX +"driverRecord.add"+QUEUE_ROUTING_KEY;
+
+
+}

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

@@ -52,4 +52,10 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_GOODS_ON_DEAD_ROUTE_KEY ="clx-order.order.goods.on.dead.route.key";
 
+    public static final String ORDER_CANCEL_QUEUE ="clx-order.order.cancel.queue";
+
+    public static final String ORDER_CANCEL_EXCHANGE ="clx-order.order.cancel.exchange";
+
+    public static final String ORDER_CANCEL_ROUTE_KEY ="clx-order.order.cancel.route.key";
+
 }

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

@@ -39,6 +39,18 @@ public class RabbitKeyOrderChildConstants {
     public static final String ORDER_CHILD_ADD_QUEUE = PREFIX +"orderChild.add"+QUEUE;
     public static final String ORDER_CHILD_ADD_ROUTING_KEY = PREFIX +"orderChild.add"+QUEUE_ROUTING_KEY;
 
+    /**
+     * 到达货源地
+     */
+    public static final String ORDER_CHILD_ARRIVE_SEND_ADDRESS_QUEUE = PREFIX +"orderChild.arriveSendAddress"+QUEUE;
+    public static final String ORDER_CHILD_ARRIVE_SEND_ADDRESS_ROUTING_KEY = PREFIX +"orderChild.arriveSendAddress"+QUEUE_ROUTING_KEY;
+
+    /**
+     * 到达目的地
+     */
+    public static final String ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_QUEUE = PREFIX +"orderChild.arriveReceiveAddress"+QUEUE;
+    public static final String ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_ROUTING_KEY = PREFIX +"orderChild.arriveReceiveAddress"+QUEUE_ROUTING_KEY;
+
     /**
      * 司机确认
      */
@@ -51,4 +63,10 @@ public class RabbitKeyOrderChildConstants {
     public static final String CHILD_FINISH_QUEUE = PREFIX +"child.finish"+QUEUE;
     public static final String CHILD_FINISH_ROUTING_KEY = PREFIX +"child.finish"+QUEUE_ROUTING_KEY;
 
+    /**
+     * 运单取消
+     */
+    public static final String ORDER_CHILD_CANCEL_QUEUE = PREFIX +"orderChild.cancel"+QUEUE;
+    public static final String ORDER_CHILD_CANCEL_ROUTING_KEY = PREFIX +"orderChild.cancel"+QUEUE_ROUTING_KEY;
+
 }

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

@@ -19,13 +19,16 @@ public class RedisConstants {
 
     public static final String CARRIER_ORDER_NUM_POOL_KEY = "clx-performance:order:orderNumPool:{date}";
 
-    public static final String ORDER_GOODS_STATUS_LAZY = "clx:order:goods:status:lazy:";
+    public static final String ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME = "clx:order:goods:status:lazy:lastOrderTime";
+
+    public static final String ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME = "clx:order:goods:status:lazy:lastArriveSendTime";
+
 
     public static final String ORDER_GOODS_TRUCK_RECORD = "clx:order:goods:truck:record:";
     public static final String ORDER_GOODS_RECORD = "clx:order:goods:record:";
+
     /**
      * 雪花
      */
     public static final String ID_SNOWFLAKE = "clx-performance:idsnowflake";
-
 }

performance-web/src/main/java/com/clx/performance/controller/app/breakcontract/AppDriverBreakContractDriverRecordController.java

+package com.clx.performance.controller.app.breakcontract;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.breakcontract.DriverPageBreakContractDriverRecordParam;
+import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
+import com.clx.performance.utils.LocalDateTimeUtils;
+import com.clx.performance.vo.app.breakcontract.DriverBreakContractDriverRecordVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/driver/breakContract/record")
+@Validated
+@Api(tags = "司机APP-违约")
+@AllArgsConstructor
+public class AppDriverBreakContractDriverRecordController {
+
+    private final BreakContractDriverRecordService breakContractDriverRecordService;
+
+    @ApiOperation(value = "分页搜索违约列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRecord")
+    @UnitCovert(param = false)
+    public Result<PageData<DriverBreakContractDriverRecordVO>> pageRecord(@RequestBody @Validated DriverPageBreakContractDriverRecordParam param) {
+
+        if (StringUtils.isBlank(param.getCreateTime())) {param.setCreateTime(LocalDateTimeUtils.formatTime());}
+        param.setBeginTime(LocalDateTimeUtils.getStringMonthStart(param.getCreateTime()));
+        param.setEndTime(LocalDateTimeUtils.getStringMonthEnd(param.getCreateTime()));
+
+        IPage<DriverBreakContractDriverRecordVO> page = breakContractDriverRecordService.driverPageRecord(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "查询运单取消违约金额", notes = "<br>By:艾庆国")
+    @GetMapping("/getOrderChildCancelBreakContractFigure")
+    public Result<BigDecimal> getBreakContractFigure(String childNo) {
+        return Result.ok(breakContractDriverRecordService.getBreakContractFigure(childNo));
+    }
+
+}

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

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
+import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/feign/breakContract")
+@Validated
+@Api(tags = "货主违约结算单")
+@AllArgsConstructor
+public class BreakContractSettlementOwnerFeignController {
+
+    private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
+
+
+    @ApiOperation(value = "货主订单吨数下调自动保存违约结算单")
+    @PostMapping("/saveSettlementOwnerForTonnageDown")
+    Result<Void> saveBreakContractSettlementOwner(@RequestBody @Validated OrderAdjustTonnageDownParam param){
+        breakContractSettlementOwnerService.saveSettlementOwnerForTonnageDown(param);
+        return Result.ok();
+    }
+
+
+
+}

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

+package com.clx.performance.controller.feign;
+
+
+import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.service.OrderCancelService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/feign/order")
+@Validated
+@AllArgsConstructor
+@Api(tags = "Feign-订单取消")
+public class OrderCancelFeignController {
+
+
+    private final OrderCancelService orderCancelService;
+
+    @ApiOperation(value = "货主端订单取消", notes = "<br>By:胡宇帆")
+    @PostMapping("/orderCancel")
+    public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
+//        OrderCancelParam cancelParam = new OrderCancelParam();
+//        cancelParam.setOrderNo(param.getOrderNo());
+//        cancelParam.setCancelType(3);
+//        cancelParam.setCreateByType(1);
+//        orderCancelService.platformCancelOrderPrePC(cancelParam);
+        orderCancelService.ownerCancelOrderPre(param.getOrderNo());
+        return Result.ok();
+    }
+}

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

 package com.clx.performance.controller.feign;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.OrderChildService;
+import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @RestController
 @RequestMapping("/feign/orderChild")
@@ -21,8 +25,24 @@ public class OrderChildFeignController {
     private final OrderChildService orderChildService;
 
     @GetMapping({"/getOrderChildTotalByUserNo"})
-    Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo){
+    Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo) {
         Integer totalByUserNo = orderChildService.getOrderChildTotalByUserNo(userNo);
         return totalByUserNo;
     }
+
+    /**
+     * 查询在途运单
+     *
+     * @param orderNo
+     * @return
+     */
+    @GetMapping({"/selectInTransitOrderChild"})
+    Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo) {
+        List<OrderChild> orderChildren = orderChildService.selectInTransitOrderChild(orderNo);
+        if (CollectionUtil.isNotEmpty(orderChildren)) {
+            return Result.ok(true);
+        } else {
+            return Result.ok(false);
+        }
+    }
 }

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

@@ -2,6 +2,7 @@ package com.clx.performance.controller.feign;
 
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -26,4 +28,11 @@ public class OrderGoodsFeignController {
     List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(@RequestParam("userNo") @NotNull(message = "订单编号不可为空") String orderNo) {
         return orderGoodsService.getOrderGoodsListByOrderNo(orderNo);
     }
+
+    @GetMapping({"/updateOrderGoodsStopFlag"})
+    Result<Boolean> updateOrderGoodsStopFlag(@RequestParam("orderNo") @NotBlank(message = "订单编号不可为空") String orderNo,
+                                             @RequestParam("stopFlag") @NotNull(message = "暂停标志不可为空") Integer stopFlag) {
+        return Result.ok(orderGoodsService.updateOrderGoodsStopFlag(orderNo,stopFlag));
+    }
+
 }

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

@@ -2,17 +2,19 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
+import com.clx.performance.param.pc.OrderGoodsCancelParam;
+import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
-import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.mapper.OrderGoodsMapper;
+import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderChildPCVO;
+import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
@@ -21,15 +23,15 @@ import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -52,9 +54,6 @@ public class GoodsOrderController {
     @Autowired
     OrderGoodsService orderGoodsService;
 
-    @Autowired
-    OrderGoodsMapper orderGoodsMapper;
-
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
@@ -90,6 +89,7 @@ public class GoodsOrderController {
             goodsOrderStrategyContext.strategyContext.get(truckDemand).saveGoodsOrder(orderGoodsParams, orderInfo, now, rabbitTemplate);
 
         } catch (Exception e) {
+            log.error(ExceptionUtils.getStackTrace(e));
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
         } finally {
             try {
@@ -128,4 +128,64 @@ public class GoodsOrderController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "货单编辑查询", notes = "<br>By:胡宇帆")
+    @GetMapping("/findOrderGoodsByBatchNumber")
+    public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "id") Integer id){
+        OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsById(id);
+        return Result.ok(orderGoodsVO);
+    }
+
+    @ApiOperation(value = "货单编辑提交", notes = "<br>By:刘海泉")
+    @PostMapping("/updateEditOrderGoods")
+    public Result<Object> updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {
+        orderGoodsService.updateEditOrderGoods(param);
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "取消订单获取弹窗样式", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderCancelStyle")
+    public Result<String> orderCancelStyle(@RequestParam(value = "orderNo") String orderNo) {
+        return Result.ok(orderGoodsService.orderCancelStyle(orderNo));
+    }
+
+    @ApiOperation(value = "取消货单获取弹窗样式", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderGoodsCancelStyle")
+    public Result<String> orderGoodsCancelStyle(@RequestParam(value = "orderGoodsNo") String orderGoodsNo) {
+        return Result.ok(orderGoodsService.orderGoodsCancelStyle(orderGoodsNo));
+    }
+
+    @ApiOperation(value = "查看未装车的车辆用于货单取消弹窗展示", notes = "<br>By:胡宇帆")
+    @GetMapping("/getOrderChildTruckList")
+    public Result<List<String>> getOrderChildTruckList(@RequestParam(value = "orderGoodsNo") String orderGoodsNo) {
+        return Result.ok(orderGoodsService.getOrderChildTruckList(orderGoodsNo));
+    }
+
+    @ApiOperation(value = "取消货单", notes = "<br>By:胡宇帆")
+    @PostMapping("/orderGoodsCancel")
+    public Result<Object> orderGoodsCancel(@RequestBody OrderGoodsCancelParam param) {
+        orderGoodsService.orderGoodsCancel(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderCancelResidueWeight")
+    public Result<BigDecimal> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
+        return Result.ok(orderGoodsService.orderCancelResidueWeight(orderNo,optionType));
+    }
+
+    @ApiOperation(value = "获取当前货单可取消吨数", notes = "<br>By:胡宇帆")
+    @PostMapping("/orderGoodsCancelResidueWeight")
+    public Result<BigDecimal> orderGoodsCancelResidueWeight(@RequestBody OrderGoodsCancelParam goodsCancelParam) {
+        return Result.ok(orderGoodsService.orderGoodsCancelResidueWeight(goodsCancelParam));
+    }
+
+    @ApiOperation(value = "调整货单价格", notes = "<br>By:刘海泉")
+    @PostMapping("/updateOrderGoodsPrice")
+    @UnitCovert(result = false)
+    public Result<Object> updateOrderGoodsPrice(@RequestBody @Validated UpdateOrderGoodsPriceParam param) {
+        orderGoodsService.updateOrderGoodsPrice(param);
+        return Result.ok();
+    }
+
 }

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

+package com.clx.performance.controller.pc;
+
+
+import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.service.OrderCancelService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/order/")
+@Validated
+@Api(tags = "PC-订单取消")
+@AllArgsConstructor
+public class OrderCancelController {
+
+    private final OrderCancelService orderCancelService;
+
+    @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
+    @PostMapping("/platformCancelOrderPre")
+    public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
+        param.setCancelType(1);
+        orderCancelService.platformCancelOrderPre(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownCancelOrderPre")
+    public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+        param.setCancelType(2);
+        orderCancelService.ownerCancelOrderPre(param);
+        return Result.ok();
+    }
+}

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

+package com.clx.performance.controller.pc;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.OrderGoodsLogParam;
+import com.clx.performance.service.OrderGoodsLogService;
+import com.clx.performance.vo.pc.OrderGoodsLogVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @ClassName GoodsOrderController
+ * @Description
+ * @Author kavin
+ * @Date 2023/9/17 17:16
+ * @Version 1.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/pc/goodsOrderLog")
+@Validated
+@AllArgsConstructor
+@Api(tags = "PC-货单日志")
+public class OrderGoodsLogController {
+
+    OrderGoodsLogService orderGoodsLogService;
+
+
+    @ApiOperation(value = "货单日志列表", notes = "<br>By:刘海泉")
+    @PostMapping("/pageOrderGoodsList")
+    public Result<PageData<OrderGoodsLogVO>> pageOrderGoodsLog(@RequestBody @Validated OrderGoodsLogParam param) {
+        IPage<OrderGoodsLogVO> page = orderGoodsLogService.pageOrderGoodsLog(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+}

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

 package com.clx.performance.controller.pc;
 
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
+import com.clx.performance.param.pc.OrderGoodsTruckListParam;
 import com.clx.performance.param.pc.PageTruckListParam;
 import com.clx.performance.param.pc.PageVicinityTruckListParam;
 import com.clx.performance.service.TruckService;
+import com.clx.performance.vo.pc.OrderGoodsTruckListVO;
 import com.clx.performance.vo.pc.PageTruckListVO;
 import com.msl.common.base.PageData;
 import com.msl.common.result.Result;
@@ -14,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @ClassName GoodsOrderController
  * @Description
@@ -65,6 +69,14 @@ public class TruckController {
 
 
 
+    @ApiOperation(value = "获取货单选择的车辆列表", notes = "<br>By:刘海泉")
+    @PostMapping("/getOrderGoodsTruckList")
+    public Result<List<OrderGoodsTruckListVO>> getOrderGoodsTruckList(@RequestBody @Validated OrderGoodsTruckListParam param) {
+        List<OrderGoodsTruckListVO> list = truckService.getOrderGoodsTruckList(param);
+        return Result.ok(list);
+    }
+
+
 
 
 

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

+package com.clx.performance.controller.pc.breakcontract.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.breakcontract.carrier.BreakContractDriverRecordAddParam;
+import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractDriverRecordParam;
+import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRecordVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/driverRecord")
+@Validated
+@Api(tags = "承运端-司机违约管理")
+@AllArgsConstructor
+public class CarrierBreakContractDriverRecordController {
+
+    private final BreakContractDriverRecordService breakContractDriverRecordService;
+
+
+    @ApiOperation(value = "新增违约记录", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRecord")
+    @UnitCovert
+    public Result<Void> saveRecord(@RequestBody @Validated BreakContractDriverRecordAddParam param) {
+        breakContractDriverRecordService.saveRecord(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页搜索违约列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRecord")
+    @UnitCovert(param = false)
+    public Result<PageData<BreakContractDriverRecordVO>> pageRecord(@RequestBody @Validated PageBreakContractDriverRecordParam param) {
+        IPage<BreakContractDriverRecordVO> page = breakContractDriverRecordService.pageRecord(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

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

+package com.clx.performance.controller.pc.breakcontract.carrier;
+
+import com.clx.performance.param.pc.breakcontract.carrier.BreakContractDriveRuleUpdateParam;
+import com.clx.performance.service.breakcontract.BreakContractDriverRuleService;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRuleVO;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/driverRule")
+@Validated
+@Api(tags = "承运端-司机违约规则")
+@AllArgsConstructor
+public class CarrierBreakContractDriverRuleController {
+
+    private final BreakContractDriverRuleService breakContractDriverRuleService;
+
+    @ApiOperation(value = "更新司机违约规则", notes = "<br>By:艾庆国")
+    @PostMapping("/updateRule")
+    @UnitCovert()
+    public Result<Void> updateRule(@RequestBody @Validated BreakContractDriveRuleUpdateParam param) {
+        breakContractDriverRuleService.updateRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询规则详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getRuleInfo")
+    public Result<BreakContractDriverRuleVO> getRuleInfo() {
+
+        return Result.ok(breakContractDriverRuleService.getRuleInfo());
+    }
+
+}

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

+package com.clx.performance.controller.pc.breakcontract.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.breakcontract.carrier.BreakContractOwnerRecordAddParam;
+import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRecordParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRecordVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/ownerRecord")
+@Validated
+@Api(tags = "承运端-货主违约管理")
+@AllArgsConstructor
+public class CarrierBreakContractOwnerRecordController {
+
+    private final BreakContractOwnerRecordService breakContractOwnerRecordService;
+
+
+    @ApiOperation(value = "新增违约记录", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRecord")
+    @UnitCovert
+    public Result<Void> saveRecord(@RequestBody @Validated BreakContractOwnerRecordAddParam param) {
+        breakContractOwnerRecordService.saveRecord(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页搜索违约列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRecord")
+    @UnitCovert(param = false)
+    public Result<PageData<BreakContractOwnerRecordVO>> pageRecord(@RequestBody @Validated PageBreakContractOwnerRecordParam param) {
+        IPage<BreakContractOwnerRecordVO> page = breakContractOwnerRecordService.pageRecord(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

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

+package com.clx.performance.controller.pc.breakcontract.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.param.pc.breakcontract.carrier.BreakContractOwnerRuleAddParam;
+import com.clx.performance.param.pc.breakcontract.carrier.BreakContractOwnerRuleStatusUpdateParam;
+import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRuleParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleFileVO;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRulePullDownVO;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.enums.ResultCodeEnum;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/ownerRule")
+@Validated
+@Api(tags = "承运端-货主违约规则")
+@AllArgsConstructor
+public class CarrierBreakContractOwnerRuleController {
+
+    private final BreakContractOwnerRuleService breakContractOwnerRuleService;
+
+    @ApiOperation(value = "新增货主违约规则", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRule")
+    @UnitCovert
+    public Result<Void> saveRule(@RequestBody @Validated BreakContractOwnerRuleAddParam param) {
+        if (StringUtils.isBlank(param.getRule().get("A-a"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-b"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-c"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-d"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-e"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+
+        breakContractOwnerRuleService.saveRule(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新状态", notes = "<br>By:艾庆国")
+    @PostMapping("/updateStatus")
+    public Result<Void> updateStatus(@RequestBody @Validated BreakContractOwnerRuleStatusUpdateParam param) {
+        breakContractOwnerRuleService.updateStatus(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询规则详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getRuleInfo")
+    @UnitCovert(param = false)
+    public Result<BreakContractOwnerRuleVO> getRuleInfo(Integer id) {
+
+        return Result.ok(breakContractOwnerRuleService.getRuleInfo(id));
+    }
+
+    @ApiOperation(value = "查询规则文档信息", notes = "<br>By:艾庆国")
+    @GetMapping("/getRuleFile")
+    public Result<BreakContractOwnerRuleFileVO> getRuleFile(Integer id) {
+
+        return Result.ok(breakContractOwnerRuleService.getRuleFile(id));
+    }
+
+    @ApiOperation(value = "分页搜索违约列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRule")
+    @UnitCovert(param = false)
+    public Result<PageData<BreakContractOwnerRuleVO>> pageRule(@RequestBody @Validated PageBreakContractOwnerRuleParam param) {
+        IPage<BreakContractOwnerRuleVO> page = breakContractOwnerRuleService.pageRule(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "查询方案下拉列表",notes = "<br>By:艾庆国")
+    @PostMapping("/listPullDown")
+    public Result<List<BreakContractOwnerRulePullDownVO>> listPullDown() {
+        return Result.ok(breakContractOwnerRuleService.listPullDown());
+    }
+
+}