Merge remote-tracking branch 'origin/v6.5_transport_open_20231115'

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

@@ -18,7 +18,8 @@ public enum IdTypeEnum {
         CASE_OUT_SUCCESS(4L, "提现成功"),
         TOP_UP_SUCCESS(5L, "充值成功"),
         FROZEN(6L, "冻结"),
-        THAW(7L, "解冻")
+        THAW(7L, "解冻"),
+        TAKE_OUT(8L, "扣除")
         ;
         private final Long code;
         private final String msg;

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("all")
+public enum NetworkDriverAccountEnum {
+    ;
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum RunningWaterStatus {
+        SETTLEMENT(10, "运单结算"),
+        CASE_OUT_FROZEN(20, "提现冻结"),
+        CASE_OUT_SUCCESS(30, "提现成功"),
+
+        ;
+        private final Integer code;
+        private final String msg;
+        public static Optional<NetworkDriverAccountEnum.RunningWaterStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public String getMsg() {
+            return this.msg;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum FundType {
+        INCOME(10, "收入"),
+        FROZEN(20, "冻结"),
+        EXPENDITURE(30, "支出"),
+
+        ;
+        private final Integer code;
+        private final String msg;
+        public static Optional<NetworkDriverAccountEnum.FundType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public String getMsg() {
+            return this.msg;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CaseOutRecordStatus {
+        WAIT_PLATFORM_PAY(10, "待平台付款"),
+        PAYED(20, "已付款"),
+        ;
+        private final Integer code;
+        private final String msg;
+        public static Optional<CaseOutRecordStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public String getMsg() {
+            return this.msg;
+        }
+    }
+}

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

@@ -67,8 +67,8 @@ public enum OwnerAccountEnum {
     @Getter
     @AllArgsConstructor
     public enum OrderChildTypeStatus {
-        ORDINARY(1, "普通单"),
-        NETWORK(2, "网运单"),
+        NETWORK(1, "网运单"),
+        ORDINARY(2, "普通单"),
         ;
         private final Integer code;
         private final String msg;

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

@@ -111,6 +111,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     PASSWORD_RESET_IS_FAIL(1909, "重置密码出现异常"),
     PASSWORD_CHECK_FAIL(1910, "交易密码填写错误,请重新输入"),
     SLIDER_CHECK_FAIL(1911, "滑块验证错误"),
+    ORDER_CHILD_SYNC_ERROR(1912, "承运同步网络货运异常"),
+
     ;
     private final int code;
     private final String msg;

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+//"车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电"
+public enum PowerTypeEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+        DIESEL_OIL(1, "柴油"),
+        NATURAL_GAS(2, "天然气"),
+        OTHER(3, "其他"),
+        NEW_ENERGY(4, "新能源/电"),
+
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Type> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static Optional<Type> getByName(String name) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getName(), name)).findFirst();
+        }
+
+        public static Integer getCodeByName(String name) {
+            return getByName(name).map(PowerTypeEnum.Type::getCode).orElse(3);
+        }
+    }
+
+
+}

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

@@ -47,6 +47,21 @@ public enum SettlementDriverEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum PrepayFreightFlag {
+        PAYED(1, "已预付"),
+        NO_PAY(0, "未预付");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<PrepayFreightFlag> 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(PrepayFreightFlag::getMsg).orElse(null);
+        }
+    }
 
 }

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

@@ -33,7 +33,10 @@ public enum SettlementOwnerEnum {
     public enum InvoiceStatus {
         INVOICED(1, "已开票"),
         NOT_INVOICE(2, "未开票"),
-        NO_NEED_INVOICE(3, "无需开票");
+        NO_NEED_INVOICE(3, "无需开票"),
+        PART_INVOICE(4, "部分开票")
+
+        ;
         private final Integer code;
         private final String msg;
 

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

+package com.clx.performance.feign;
+
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.msl.common.result.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
+public interface NetworkFeign {
+
+    @ApiOperation(value = "新增网络货运司机账户")
+    @PostMapping("clx-performance/feign/driver/createNetworkDriverAccount")
+    Result<Object> createNetworkDriverAccount(@RequestBody @Validated NetworkDriverAccountParam param);
+
+}

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

@@ -26,6 +26,8 @@ public interface OrderChildFeign {
     Result<?> syncLastTruck(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo);
 
 
+    @RequestMapping(value = "clx-performance/feign/orderChild/getInvoiceType", method = RequestMethod.GET)
+    Result<Integer> getInvoiceType(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo);
 
 
 }

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

@@ -90,6 +90,10 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
     Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
+
+    @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChildLtUnsettle"})
+    Result<Boolean> selectInTransitOrderChildLtUnsettle(@RequestParam("orderNo") String orderNo);
+
     @GetMapping(value = {"clx-performance/feign/orderGoods/updateSystemAddressId"})
     Result<Boolean> updateSystemAddressId(@RequestParam("ownerAddressId") Integer ownerAddressId,@RequestParam("systemAddressId") Integer systemAddressId);
 

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

+package com.clx.performance.feign;
+
+import com.msl.common.result.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
+public interface SettlementFeign {
+
+    @ApiOperation(value = "查询当前订单号是否已经生成货主结算单明细")
+    @GetMapping("clx-performance/feign/settlement/thawAndLockSettlement")
+    Result<Boolean> thawAndLockSettlement(@RequestParam String orderNo);
+
+}

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

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class NetworkDriverPageParam extends PageParam {
+
+    private Long userNo;
+
+    @ApiModelProperty("资金类型  全部：不需要传  10：收入 30：支出 ")
+    private Integer fundType;
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildBankInfoDTO {
+
+//    @ApiModelProperty(value = "运单号", dataType="String", required = true)
+//    private String childNo;
+//    @ApiModelProperty(value = "用户钱包", dataType="Integer", required = true)
+//    private Integer userCode;
+
+    @ApiModelProperty(value = "持卡人姓名", dataType="String", required = true)
+    private String name;
+    @ApiModelProperty(value = "银行卡卡号", dataType="String", required = true)
+    private String cardNo;
+    @ApiModelProperty(value = "手机号", dataType="String", required = true)
+    private String mobile;
+    @ApiModelProperty(value = "账户类型 11个人 12企业账户", dataType="Integer", required = true)
+    private Integer accountType;
+    @ApiModelProperty(value = "银行卡类型10借记卡20借贷卡", dataType="String", required = true)
+    private String type;
+
+//    @ApiModelProperty(value = "是否允许提现: 允许提现1 ,禁止提现0", dataType="Integer", required = true)
+//    private Integer cashOut;
+
+    @ApiModelProperty(value = "身份证号", dataType="String", required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String idCard;
+    @ApiModelProperty(value = "银行", dataType="String", required = true)
+    @NotBlank(message = "银行不能为空")
+    private String bank;
+    @ApiModelProperty(value = "银行编码", dataType="String", required = true)
+    @NotBlank(message = "银行编码不能为空")
+    private String bankCode;
+
+    @ApiModelProperty(value = "身份证正面图片", required = true)
+    @NotBlank(message = "身份证正面图片不能为空")
+    private String idCardFrontImg;
+    @ApiModelProperty(value = "身份证背面图片", required = true)
+    @NotBlank(message = "身份证背面图片不能为空")
+    private String idCardBackImg;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildDriverInfoDTO {
+
+//    @ApiModelProperty(value = "运单号", dataType="String", required = true)
+//    private String childNo;
+//    @ApiModelProperty(value = "司机ID", dataType="Integer", required = true)
+//    private Integer driverId;
+
+    @ApiModelProperty(value = "手机号", dataType="String", required = true)
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "姓名", dataType="String", required = true)
+    @NotBlank(message = "姓名手机号不能为空")
+    private String name;
+    @ApiModelProperty(value = "性别1男2女", dataType="Integer", required = true)
+    private Integer sex;
+
+//    @ApiModelProperty(value = "头像相对地址", dataType="String", required = true)
+//    private String headImg;
+//    @ApiModelProperty(value = "钱包账号", dataType="String", required = true)
+//    private String walletCode;
+
+    @ApiModelProperty(value = "身份证号", dataType="String", required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String cardNo;
+    @ApiModelProperty(value = "身份证有效期起始时间", dataType="String", required = true)
+    @NotBlank(message = "身份证有效期起始时间不能为空")
+    private String cardStartTime;
+    @ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
+    private String cardEndTime;
+    @ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer", required = true)
+    @NotNull(message = "是否是长期不能为空")
+    private Integer cardLongTerm;
+    @ApiModelProperty(value = "身份证正面图片地址", dataType="String", required = true)
+    @NotBlank(message = "身份证正面图片地址不能为空")
+    private String cardFrontImg;
+    @ApiModelProperty(value = "身份证背面图片地址", dataType="String", required = true)
+    @NotBlank(message = "身份证背面图片地址不能为空")
+    private String cardBackImg;
+    @ApiModelProperty(value = "手持身份证照片地址", dataType="String")
+    private String faceCardImg;
+
+    @ApiModelProperty(value = "驾驶证号码", dataType="String", required = true)
+//    @NotBlank(message = "驾驶证号码不能为空")
+    private String licenceNo;
+    @ApiModelProperty(value = "初次领证日期", dataType="String", required = true)
+//    @NotBlank(message = "初次领证日期不能为空")
+    private String licenseTime;
+    @ApiModelProperty(value = "驾照类型", dataType="String", required = true)
+//    @NotBlank(message = "驾照类型不能为空")
+    private String licenceClass;
+    @ApiModelProperty(value = "驾驶证正面图片", dataType="String", required = true)
+//    @NotBlank(message = "驾驶证正面图片不能为空")
+    private String licenceImg;
+    @ApiModelProperty(value = "驾驶证背面图片", dataType="String", required = true)
+//    @NotBlank(message = "驾驶证背面图片不能为空")
+    private String licenceBackImg;
+    @ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String", required = true)
+//    @NotBlank(message = "驾驶证有效期起始时间不能为空")
+    private String licenceStartTime;
+    @ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String", required = true)
+//    @NotBlank(message = "驾驶证有效期终止时间不能为空")
+    private String licenceEndTime;
+
+//    @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
+//    @NotBlank(message = "道路运输许可证图片地址不能为空")
+//    private String transportLicenceImg;
+
+    @ApiModelProperty(value = "道路运输从业资格证号", dataType="String", required = true)
+//    @NotBlank(message = "道路运输从业资格证号不能为空")
+    private String occupationalLicenceNo;
+    @ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String", required = true)
+//    @NotBlank(message = "道路运输从业资格证图片地址不能为空")
+    private String occupationalLicenceImg;
+    @ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String", required = true)
+//    @NotBlank(message = "从业资格证有效期起始时间不能为空")
+    private String occupationalStartTime;
+    @ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String", required = true)
+//    @NotBlank(message = "从业资格证有效期终止时间不能为空")
+    private String occupationalEndTime;
+
+    @ApiModelProperty(value = "驾驶证发证机关", required = true)
+//    @NotBlank(message = "驾驶证发证机关不能为空")
+    private String licenceIssueOrganization;
+    @ApiModelProperty(value = "身份证住址", required = true)
+//    @NotBlank(message = "身份证住址不能为空")
+    private String idCardAddress = "手动";
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildPaySyncParam {
+
+    @ApiModelProperty(value = "运单编号列表")
+    @NotEmpty(message = "运单编号不能为空")
+    private List<String> childNoList;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+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.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildTruckInfoDTO {
+
+//    @ApiModelProperty(value = "运单号", dataType="String", required = true)
+//    private String childNo;
+//    @ApiModelProperty(value = "车辆ID", dataType="Integer", required = true)
+//    private Integer truckId;
+//    @ApiModelProperty(value = "车主id", dataType="Integer", required = true)
+//    private Integer userId;
+
+    @ApiModelProperty(value = "车主手机号", dataType="String", required = true)
+    @NotBlank(message = "车主手机号不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+//    @ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer", required = true)
+//    private Integer truckNoColorCode;
+
+    @ApiModelProperty(value = "车头车牌颜色", dataType="String", required = true)
+    @NotBlank(message = "车头车牌颜色不能为空")
+    private String truckNoColor;
+    @ApiModelProperty(value = "型号", dataType="String", required = true)
+    @NotBlank(message = "型号不能为空")
+    private String model;
+    @ApiModelProperty(value = "载重单位吨", dataType="Integer", required = true)
+    @NotNull(message = "载重单位吨不能为空")
+    private Integer load;
+    @ApiModelProperty(value = "吨位 单位吨", dataType="Integer", required = true)
+    @NotNull(message = "吨位不能为空")
+    private Integer grossMass;
+
+    @ApiModelProperty(value = "车头道路运输许可证编号", dataType="String", required = true)
+    @NotBlank(message = "车头道路运输许可证编号不能为空")
+    private String roadTransportCertificateNo;
+    @ApiModelProperty(value = "行驶证主页照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证主页照片不能为空")
+    private String licenceImgMain;
+    @ApiModelProperty(value = "行驶证副业正面照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证副业正面照片不能为空")
+    private String licenceImgSecond;
+    @ApiModelProperty(value = "行驶证副业背面照片", dataType="String", required = true)
+    @NotBlank(message = "行驶证副业背面照片不能为空")
+    private String licenceImgSecondBack;
+    @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
+    @NotBlank(message = "道路运输许可证图片地址不能为空")
+    private String transportLicenceImg;
+
+    @ApiModelProperty(value = "行驶证有效期开始时间")
+    private String drivingLicenseBeginTime;
+    @ApiModelProperty(value = "行驶证有效期结束时间", required = true)
+    @NotBlank(message = "行驶证有效期结束时间不能为空")
+    private String drivingLicenseEndTime;
+    @ApiModelProperty(value = "运输证有效期开始时间")
+    private String transportationLicenseBeginTime;
+    @ApiModelProperty(value = "运输证有效期结束时间")
+    private String transportationLicenseEndTime;
+
+    @ApiModelProperty(value = "挂车牌号")
+    private String truckNo2;
+    @ApiModelProperty("挂车行驶证主页")
+    private String licenceImgMain2;
+    @ApiModelProperty("挂车行驶证副页")
+    private String licenceImgSecond2;
+    @ApiModelProperty("挂车行驶证副页背面")
+    private String licenceImgSecond2Back;
+    @ApiModelProperty("挂车年检有效期至")
+    private String licenceImgMain2EndTime;
+    @ApiModelProperty("挂车道路运输许可证编号")
+    private String roadTransportCertificateNo2;
+    @ApiModelProperty("挂车道路运输许可证图片地址")
+    private String transportLicenceImg2;
+
+    @ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer", required = true)
+    @NotNull(message = "车辆燃料类型不能为空")
+    private Integer powerType;
+    @ApiModelProperty(value = "使用性质", required = true)
+    @NotBlank(message = "使用性质不能为空")
+    private String useNature;
+    @ApiModelProperty(value = "车辆识别代码", required = true)
+    @NotBlank(message = "车辆识别代码不能为空")
+    private String identifyCode;
+    @ApiModelProperty(value = "行驶证发证机关", required = true)
+    @NotBlank(message = "行驶证发证机关不能为空")
+    private String licenceIssueOrganization;
+    @ApiModelProperty(value = "注册日期", required = true)
+    @NotBlank(message = "注册日期不能为空")
+    private String registerDate;
+    @ApiModelProperty(value = "行驶证发证日期", required = true)
+    @NotBlank(message = "行驶证发证日期不能为空")
+    private String licenceIssueDate;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @description:
+ * @Author:liumingchao
+ * @Date:2022/11/4 13:50
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildTruckTraceDTO {
+
+    @ApiModelProperty(value = "运单号", required = true)
+    private String childNo;
+    @ApiModelProperty(value = "定位时间", required = true)
+    @NotBlank(message = "定位时间不能为空")
+    private String locationTime;
+    @ApiModelProperty(value = "定位经度", required = true)
+    @NotBlank(message = "定位经度不能为空")
+    private String locationLon;
+    @ApiModelProperty(value = "定位纬度", required = true)
+    @NotBlank(message = "定位纬度不能为空")
+    private String locationLat;
+    @ApiModelProperty(value = "定位详细位置信息")
+    private String locationAddress;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 法人货主同步
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerLegalSyncParam implements Serializable {
+
+    @ApiModelProperty(value = " 法人姓名 ", required = true)
+    @NotBlank(message = "货主登录手机号不可为空")
+    private String name;
+    @ApiModelProperty(value = " 货主手机号码 ", required = true)
+    @NotBlank(message = "货主姓名不可为空")
+    private String mobile;
+    @ApiModelProperty(value = " 身份证号 ", required = true)
+    @NotBlank(message = "身份证号不可为空")
+    private String cardNo;
+
+    @ApiModelProperty(value = " 企业名称 ", required = true)
+    private String company;
+    @ApiModelProperty(value = " 注册时间 ", required = true)
+    private String registerTime;
+
+    @ApiModelProperty(value = " 省 ", required = true)
+    private String province;
+    @ApiModelProperty(value = " 省code ", required = true)
+    private Integer provinceCode;
+    @ApiModelProperty(value = " 市 ", required = true)
+    private String city;
+    @ApiModelProperty(value = " 市code ", required = true)
+    private Integer cityCode;
+    @ApiModelProperty(value = " 区县 ", required = true)
+    private String county;
+    @ApiModelProperty(value = " 区县code ", required = true)
+    private Integer countyCode;
+    @ApiModelProperty(value = " 乡镇 ", required = true)
+    private String town;
+    @ApiModelProperty(value = " 乡镇code ", required = true)
+    private Integer townCode;
+    @ApiModelProperty(value = " 街道 ", required = true)
+    private String street;
+    @ApiModelProperty(value = " 街道code ", required = true)
+    private Integer streetCode;
+    @ApiModelProperty(value = " 详细地址 ", required = true)
+    private String address;
+
+    @ApiModelProperty(value = " 申请类型:1法人认证2代理人认证 ", required = true)
+    private Integer applyType;
+    @ApiModelProperty(value = " 法人姓名 ")
+    private String legalName;
+    @ApiModelProperty(value = " 法人手机号 ")
+    private String legalMobile;
+    @ApiModelProperty(value = " 法人身份证号 ")
+    private String legalCardNo;
+    @ApiModelProperty(value = " 法人身份证正面图片地址 ")
+    private String legalFrontImg;
+    @ApiModelProperty(value = " 法人身份证背面图片地址 ")
+    private String legalBackImg;
+    @ApiModelProperty(value = " 法人统一社会信用代码 ")
+    private String legalGroupCode;
+    @ApiModelProperty(value = " 法人营业执照图片地址 ")
+    private String legalBusinessImg;
+
+    @ApiModelProperty(value = " 代理人姓名 ")
+    private String agentName;
+    @ApiModelProperty(value = " 代理人手机号 ")
+    private String agentMobile;
+    @ApiModelProperty(value = " 代理人身份证号 ")
+    private String agentCardNo;
+    @ApiModelProperty(value = " 代理人身份证正面图片地址 ")
+    private String agentFrontImg;
+    @ApiModelProperty(value = " 代理人身份证背面图片地址 ")
+    private String agentBackImg;
+    @ApiModelProperty(value = " 代理人统一社会信用代码 ")
+    private String agentGroupCode;
+    @ApiModelProperty(value = " 代理人授权书图片地址 ")
+    private String agentBusinessImg;
+
+    @ApiModelProperty(value = " 企业联系人姓名 ", required = true)
+    private String businessName;
+    @ApiModelProperty(value = " 企业联系人手机号 ", required = true)
+    private String businessMobile;
+    @ApiModelProperty(value = " 企业类型 ", required = true)
+    private Integer businessType;
+
+    @ApiModelProperty(value = " 注册机构名称 ")
+    private String registerOrgName;
+    @ApiModelProperty(value = " 注册资本（单位：万元） ")
+    private Double registerAmount;
+    @ApiModelProperty(value = " 组织机构代码 ")
+    private String orgGroupCode;
+    @ApiModelProperty(value = " 企业邮箱 ")
+    private String businessEmail;
+    @ApiModelProperty(value = " 核准时间 ")
+    private String checkTime;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 自然人货主同步
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class OwnerPersonalSyncParam {
+
+    @ApiModelProperty(value = " 登陆手机号 ", required = true)
+    @NotBlank(message = "货主登录手机号不可为空")
+    private String mobile;
+    @ApiModelProperty(value = " 货主姓名 ", required = true)
+    @NotBlank(message = "货主姓名不可为空")
+    private String name;
+    @ApiModelProperty(value = " 身份证号 ", required = true)
+    @NotBlank(message = "身份证号不可为空")
+    private String cardNo;
+
+    @ApiModelProperty(value = " 省 ", required = true)
+    private String province;
+    @ApiModelProperty(value = " 省code ", required = true)
+    private Integer provinceCode;
+    @ApiModelProperty(value = " 市 ", required = true)
+    private String city;
+    @ApiModelProperty(value = " 市code ", required = true)
+    private Integer cityCode;
+    @ApiModelProperty(value = " 区县 ", required = true)
+    private String county;
+    @ApiModelProperty(value = " 区县code ", required = true)
+    private Integer countyCode;
+
+//    @ApiModelProperty(value = " 乡镇 ", required = false)
+//    private String town;
+//    @ApiModelProperty(value = " 乡镇code ", required = false)
+//    private Integer townCode;
+//    @ApiModelProperty(value = " 街道 ", required = false)
+//    private String street;
+//    @ApiModelProperty(value = " 街道code ", required = false)
+//    private Integer streetCode;
+
+    @NotBlank(message = "详细地址不可为空")
+    @ApiModelProperty(value = " 详细地址 ", required = true)
+    private String address;
+
+    @NotBlank(message = "身份证正面图片不可为空")
+    @ApiModelProperty(value = " 身份证正面图片地址 ", required = true)
+    private String legalFrontImg;
+    @NotBlank(message = "身份证背面图片不可为空")
+    @ApiModelProperty(value = " 身份证背面图片地址 ", required = true)
+    private String legalBackImg;
+    @ApiModelProperty(value = "手持身份证")
+    private String personHandheldImg;
+
+    @ApiModelProperty(value = " 个人邮箱 ")
+    private String businessEmail;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerSettlementSyncParam {
+
+    @ApiModelProperty(value = "货主手机")
+    @NotBlank(message = "货主手机不能为空")
+    private String ownerMobile;
+
+    @ApiModelProperty(value = "结算单列表")
+    @Valid
+    @NotEmpty(message = "结算单列表不能空")
+    private List<SettlementItem> settlementList;
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    public static class SettlementItem{
+        @ApiModelProperty(value = "运单编号列表")
+        @NotEmpty(message = "运单编号不能空")
+        private String childNo;
+
+        @ApiModelProperty(value = "结算单编号")
+        @NotEmpty(message = "结算单编号不能空")
+        private String settlementNo;
+
+    }
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ThirdOrderChildBrokerParam {
+
+    @ApiModelProperty(value = "运单编码", dataType="String", required = true)
+    @NotBlank(message = "订单编码不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "订单编码", dataType="String", required = true)
+    @NotBlank(message = "货单编码不能为空")
+    private String orderNo;
+    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+    @ApiModelProperty(value = "运费单价 单位分 (司机运费单价)", dataType="Integer", required = true)
+    @NotNull(message = "运费单价不能为空")
+    private Integer freightPrice;
+    @ApiModelProperty(value = "运费 单位分 (含税金额)", dataType="Integer", required = true)
+    @NotNull(message = "运费不能为空")
+    private Integer freight;
+    @ApiModelProperty(value = "实付运费 单位分 (司机运费总价)", dataType="Integer", required = true)
+    @NotNull(message = "实付运费不能为空")
+    private Integer freightNoCard;
+    @ApiModelProperty(value = "溢价金额", dataType = "Integer", required = true)
+    @NotNull(message = "溢价金额不能为空")
+    private Integer orderChildBrokerBeyondFreight = 0;
+    @ApiModelProperty(value = "司机实际净重", dataType="BigDecimal", required = true)
+    @NotNull(message = "司机实际净重不能为空")
+    private BigDecimal net;
+    @ApiModelProperty(value = "装车净重", dataType="BigDecimal")
+    @NotNull(message = "装车净重不能为空")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "发货地址", dataType="String", required = true)
+    @NotBlank(message = "发货地址不能为空")
+    private String sendAddress;
+    @ApiModelProperty(value = "货源所在省份", dataType="String", required = true)
+    @NotBlank(message = "货源所在省份不能为空")
+    private String sendProvince;
+    @ApiModelProperty(value = "货源所在城市", dataType="String", required = true)
+    @NotBlank(message = "货源所在城市不能为空")
+    private String sendCity;
+    @ApiModelProperty(value = "货源所在区县", dataType="String", required = true)
+    @NotBlank(message = "货源所在区县不能为空")
+    private String sendCounty;
+    @ApiModelProperty(value = "货源所在乡镇", dataType="String", required = true)
+//    @NotBlank(message = "货源所在乡镇不能为空")
+    private String sendTown;
+    @ApiModelProperty(value = "发货人", dataType="String", required = true)
+    @NotBlank(message = "发货人不能为空")
+    private String sendName;
+    @ApiModelProperty(value = "发货人手机号", dataType="String", required = true)
+    @NotBlank(message = "发货人手机号不能为空")
+    private String sendMobile;
+
+    @ApiModelProperty(value = "收货人所在省", dataType="String", required = true)
+    @NotBlank(message = "收货人所在省不能为空")
+    private String receiveProvince;
+    @ApiModelProperty(value = "收货人所在城市", dataType="String", required = true)
+    @NotBlank(message = "收货人所在城市不能为空")
+    private String receiveCity;
+    @ApiModelProperty(value = "收货人所在区县", dataType="String", required = true)
+    @NotBlank(message = "收货人所在区县不能为空")
+    private String receiveCounty;
+    @ApiModelProperty(value = "收货人所在乡镇", dataType="String", required = true)
+//    @NotBlank(message = "收货人所在乡镇不能为空")
+    private String receiveTown = "手动";
+    @ApiModelProperty(value = "收货地址", dataType="String", required = true)
+    @NotBlank(message = "收货地址不能为空")
+    private String receiveAddress;
+    @ApiModelProperty(value = "收货人", dataType="String", required = true)
+    @NotBlank(message = "收货人不能为空")
+    private String receiveName;
+    @ApiModelProperty(value = "收货人手机号", dataType="String", required = true)
+    @NotBlank(message = "收货人手机号不能为空")
+    private String receiveMobile;
+
+    @ApiModelProperty(value = "装车地址经度", required = true)
+    @NotBlank(message = "装车地址经度不能为空")
+    private String loadLongitude;
+    @ApiModelProperty(value = "装车地址纬度", required = true)
+    @NotBlank(message = "装车地址纬度不能为空")
+    private String loadLatitude;
+    @ApiModelProperty(value = "卸车地址经度", required = true)
+    @NotBlank(message = "卸车地址经度不能为空")
+    private String unloadLongitude;
+    @ApiModelProperty(value = "卸车地址纬度", required = true)
+    @NotBlank(message = "卸车地址纬度不能为空")
+    private String unloadLatitude;
+    @ApiModelProperty(value = "运输距离（公里）", required = true)
+    @NotNull(message = "运输距离不能为空")
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "接单时间", dataType="String", required = true)
+    @NotBlank(message = "接单时间不能为空")
+    private String payTime;
+    @ApiModelProperty(value = "装车时间", dataType="String", required = true)
+    @NotBlank(message = "装车时间不能为空")
+    private String loadTime;
+    @ApiModelProperty(value = "卸车时间", dataType="String", required = true)
+    @NotBlank(message = "卸车时间不能为空")
+    private String unloadTime;
+    @ApiModelProperty(value = "支付完成时间", dataType="String", required = true)
+    @NotBlank(message = "支付完成时间不能为空")
+    private String payFinishedTime;
+
+//    @ApiModelProperty(value = "备注", dataType="String")
+//    private String remark;
+    @ApiModelProperty(value = "创建时间", dataType="String", required = true)
+    private String createTime;
+
+    @ApiModelProperty(value = "收货单位", dataType="String")
+    private String receiveCompany;
+    @ApiModelProperty(value = "发货单位", dataType="String")
+    private String sendCompany;
+    @ApiModelProperty(value = "卸车净重", dataType="BigDecimal", required = true)
+    @NotNull(message = "卸车净重不能为空")
+    private BigDecimal receiveNet;
+
+    @ApiModelProperty(value = "货物名称", dataType="String", required = true)
+    @NotBlank(message = "货物名称不能为空")
+    private String goodsName;
+//    @ApiModelProperty(value = "是否车主本人：1是，0否", dataType="Integer", required = true)
+//    private Integer personalDriverFlag;
+
+    @ApiModelProperty(value = "垫付类型 0 全额垫付 1 不垫付服务费", dataType="Integer", required = true)
+    @NotNull(message = "垫付类型不能为空")
+    private Integer advanceType;
+
+    @ApiModelProperty(value = "货物价格 单位 分", required = true)
+    @NotNull(message = "货物价格不能为空")
+    private Integer goodsPrice;
+
+    @ApiModelProperty(value = "源订单号 (承运平台订单号)")
+    @NotBlank(message = "源订单号不能为空")
+    private String sourceOrderNo;
+    @ApiModelProperty(value = "源货单号 (承运平台货单号)")
+    @NotBlank(message = "源货单号不能为空")
+    private String sourceGoodsNo;
+
+    @ApiModelProperty(value = "源开票方式 (开票方式) ：1 装车 2 卸车")
+    @NotNull(message = "源开票方式不能为空")
+    private Integer sourceInvoicingType;
+    @ApiModelProperty(value = "源单价 (承运单价)")
+    @NotNull(message = "源单价不能为空")
+    private BigDecimal sourceFreightPrice;
+    @ApiModelProperty(value = "源开票金额 (开票金额)")
+    @NotNull(message = "源开票金额不能为空")
+    private BigDecimal sourceInvoicingPrice;
+    @ApiModelProperty(value = "源亏吨金额 (亏吨金额)")
+    @NotNull(message = "源亏吨金额不能为空")
+    private BigDecimal sourceLossPrice;
+
+    @ApiModelProperty(value = "装车磅单图片", required = true)
+    @NotEmpty(message = "装车磅单图片不能为空")
+    private List<String> loadPoundImages;
+    @ApiModelProperty(value = "卸车磅单图片", required = true)
+    @NotEmpty(message = "卸车磅单图片不能为空")
+    private List<String> unLoadPoundImages;
+
+    @ApiModelProperty(value = "关联账号(货主手机号)", required = true)
+    @NotBlank(message = "关联账号不能为空")
+    private String invoiceRelationNo;
+
+    @ApiModelProperty(value = "货单信息", required = true)
+    @Valid
+    private ThirdOrderInfoDTO orderInfoDTO;
+
+    @ApiModelProperty(value = "车主信息", required = true)
+    @Valid
+    private OrderChildDriverInfoDTO truckDriverInfoDTO;
+
+    @ApiModelProperty(value = "司机信息", required = true)
+    @Valid
+    private OrderChildDriverInfoDTO driverInfoDTO;
+
+    @ApiModelProperty(value = "车主银行卡信息", required = true)
+    @Valid
+    private OrderChildBankInfoDTO truckDriverBankInfoDTO;
+
+    @ApiModelProperty(value = "司机银行卡信息", required = true)
+    @Valid
+    private OrderChildBankInfoDTO driverBankInfoDTO;
+
+    @ApiModelProperty(value = "车辆信息", required = true)
+    @Valid
+    private OrderChildTruckInfoDTO truckInfoDTO;
+
+    @ApiModelProperty(value = "运单轨迹", required = true)
+    @Valid
+    @NotEmpty(message = "运单轨迹不能为空")
+    private List<OrderChildTruckTraceDTO> brokerTraceList;
+
+//    @ApiModelProperty(value = "来源:0-货易来,1-诚联信 2承运", hidden = true)
+//    private Integer source;
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class ThirdOrderChildRiskStatusParam {
+
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+
+    @ApiModelProperty(value = "合规状态：0不合规 1合规 2未同步 ")
+    private Integer status;
+
+    @ApiModelProperty(value = "风控原因")
+    private String riskReason;
+
+
+}

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

+package com.clx.performance.param.feign.transport;
+
+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;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class ThirdOrderInfoDTO {
+
+    @ApiModelProperty(value = "货单编码", required = true)
+    private String orderNo;
+    @ApiModelProperty(value = "货物名称", required = true)
+    private String goodsName;
+
+    @ApiModelProperty(value = "发货单位")
+    private String sendCompany;
+    @ApiModelProperty(value = "发货所在省份", required = true)
+    @NotBlank(message = "发货所在省份不能为空")
+    private String sendProvince;
+    @ApiModelProperty(value = "发货所在城市", required = true)
+    @NotBlank(message = "发货所在城市不能为空")
+    private String sendCity;
+    @ApiModelProperty(value = "发货所在区县", required = true)
+    @NotBlank(message = "发货所在区县不能为空")
+    private String sendCounty;
+    @ApiModelProperty(value = "发货所在乡镇", required = true)
+//    @NotBlank(message = "发货所在乡镇不能为空")
+    private String sendTown;
+    @ApiModelProperty(value = "发货详细地址", required = true)
+    @NotBlank(message = "发货详细地址不能为空")
+    private String sendAddress;
+    @ApiModelProperty(value = "发货联系人", required = true)
+    @NotBlank(message = "发货联系人不能为空")
+    private String sendName;
+    @ApiModelProperty(value = "发货联系人手机号", required = true)
+    @NotBlank(message = "发货联系人手机号不能为空")
+    private String sendMobile;
+    @ApiModelProperty(value = "发货地址经度", required = true)
+    @NotBlank(message = "发货地址经度不能为空")
+    private String loadLongitude;
+    @ApiModelProperty(value = "发货地址纬度", required = true)
+    @NotBlank(message = "发货地址纬度不能为空")
+    private String loadLatitude;
+
+    @ApiModelProperty(value = "收货单位")
+    private String receiveCompany;
+    @ApiModelProperty(value = "收货人所在省", required = true)
+    @NotBlank(message = "收货人所在省不能为空")
+    private String receiveProvince;
+    @ApiModelProperty(value = "收货人所在城市", required = true)
+    @NotBlank(message = "收货人所在城市不能为空")
+    private String receiveCity;
+    @ApiModelProperty(value = "收货人所在区县", required = true)
+    @NotBlank(message = "收货人所在区县不能为空")
+    private String receiveCounty;
+    @ApiModelProperty(value = "收货人所在乡镇", required = true)
+//    @NotBlank(message = "收货人所在乡镇不能为空")
+    private String receiveTown;
+    @ApiModelProperty(value = "收货详细地址", required = true)
+    @NotBlank(message = "收货详细地址不能为空")
+    private String receiveAddress;
+    @ApiModelProperty(value = "收货联系人", required = true)
+    @NotBlank(message = "收货联系人不能为空")
+    private String receiveName;
+    @ApiModelProperty(value = "收货联系人手机号", required = true)
+    @NotBlank(message = "收货联系人手机号不能为空")
+    private String receiveMobile;
+    @ApiModelProperty(value = "收货地址经度", required = true)
+    @NotBlank(message = "收货地址经度不能为空")
+    private String unloadLongitude;
+    @ApiModelProperty(value = "收货地址纬度", required = true)
+    @NotBlank(message = "收货地址纬度不能为空")
+    private String unloadLatitude;
+
+    @ApiModelProperty(value = "货物单价（单位：分）", required = true)
+    @NotNull(message = "货物单价不能为空")
+    private Integer goodsPrice;
+    @ApiModelProperty(value = "运费单价（单位：分）", required = true)
+    @NotNull(message = "运费单价不能为空")
+    private Integer transPrice;
+    @ApiModelProperty(value = "货物总重量(吨)", required = true)
+    @NotNull(message = "货物总重量不能为空")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty(value = "最晚装货时间", required = true)
+    @NotBlank(message = "最晚装货时间不能为空")
+    private String extractTime;
+    @ApiModelProperty(value = "司机最晚到达时间", required = true)
+    @NotBlank(message = "司机最晚到达时间不能为空")
+    private String arriveTime;
+
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageNetworkAccountInfoListParam extends PageParam {
+
+    @ApiModelProperty(value = "手机号", example = "13966554477")
+    private String mobile;
+
+    @ApiModelProperty(value = "网络货运流水类型")
+    private Integer runningWaterType;
+
+    @ApiModelProperty(value = "司机编码")
+    private String driverUserNo;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageNetworkAccountListParam extends PageParam {
+
+    @ApiModelProperty(value = "手机号", example = "13966554477")
+    private String mobile;
+
+    @ApiModelProperty(value = "车主名称")
+    private String driverUserName;
+
+    @ApiModelProperty(value = "司机编码")
+    private String driverUserNo;
+}

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageNetworkCaseOutRecordListParam extends PageParam {
+
+    @ApiModelProperty(value = "手机号", example = "13966554477")
+    private String mobile;
+
+    @ApiModelProperty(value = "运单编号")
+    private String childNo;
+
+    @ApiModelProperty(value = "车主编码")
+    private String driverUserNo;
+}

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

+package com.clx.performance.param.pc.driver;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class NetworkDriverAccountParam {
+
+    private Long driverUserNo;
+
+    private String driverUserName;
+
+    private String mobile;
+
+    private LocalDateTime creteTime;
+
+}

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

+package com.clx.performance.vo.app;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class APPNetworkDriverRunningWaterRecordVO {
+
+    private Integer id;
+
+    @ApiModelProperty("流水号")
+    private Long runningWaterNo;
+
+    @ApiModelProperty("司机编码")
+    private Long driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
+    private Integer runningWaterType;
+
+    @ApiModelProperty("流水类型简介")
+    private String runningWaterTypeMsg;
+
+    @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
+    private Integer fundType;
+
+    @ApiModelProperty("资金类型简介")
+    private String fundTypeMsg;
+
+    @ApiModelProperty("")
+    private Long relationId;
+
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @ApiModelProperty("变动金额")
+    @MoneyOutConvert
+    private BigDecimal alterationBalance;
+
+    @ApiModelProperty("冻结金额")
+    @MoneyOutConvert
+    private BigDecimal frozenBalance;
+
+    @ApiModelProperty("可用余额")
+    @MoneyOutConvert
+    private BigDecimal usableBalance;
+
+    @ApiModelProperty("账户余额")
+    @MoneyOutConvert
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("扣除金额")
+    @MoneyOutConvert
+    private BigDecimal takeOutBalance;
+
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

performance-api/src/main/java/com/clx/performance/vo/feign/transport/ThirdOrderChildBrokerResultVO.java

+package com.clx.performance.vo.feign.transport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class ThirdOrderChildBrokerResultVO {
+
+    @ApiModelProperty(value = "风控结果列表，空未风控")
+    private List<RiskItem> riskList;
+
+    @ApiModelProperty(value = "合规状态：0不合规 1合规")
+    private Integer status;
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class RiskItem {
+        @ApiModelProperty(value = "类型", example = "PRICE_LOW")
+        private String type;
+
+        @ApiModelProperty(value = "风控原因", example = "运费单价过低")
+        private String msg;
+    }
+
+}

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class NetworkCaseOutRecordVO {
+
+    private Integer id;
+
+    @ApiModelProperty("提现单号")
+    private Long caseOutNo;
+
+    @ApiModelProperty("司机编码")
+    private String driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("收款人")
+    private String payee;
+
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账户")
+    private String collectionBankCode;
+
+    @ApiModelProperty("状态 10：待平台付款 20：已付款")
+    private Integer status;
+
+    @ApiModelProperty("状态简介")
+    private String statusMsg;
+
+    @ApiModelProperty("平台")
+    private String platform;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @ApiModelProperty("变动金额")
+    @MoneyOutConvert
+    private BigDecimal alterationBalance;
+
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("提现完成时间")
+    private String finishTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class NetworkDriverAccountVO {
+
+    private Integer id;
+
+    @ApiModelProperty("司机编码")
+    private String driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("账户余额")
+    @MoneyOutConvert
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("可用余额")
+    @MoneyOutConvert
+    private BigDecimal usableBalance;
+
+    @ApiModelProperty("冻结余额")
+    @MoneyOutConvert
+    private BigDecimal frozenBalance;
+
+    @ApiModelProperty("钱包code")
+    private String walletCode;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class NetworkDriverRunningWaterRecordVO{
+
+    private Integer id;
+
+    @ApiModelProperty("流水号")
+    private Long runningWaterNo;
+
+    @ApiModelProperty("司机编码")
+    private String driverUserNo;
+
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
+    private Integer runningWaterType;
+
+    @ApiModelProperty("流水类型简介")
+    private String runningWaterTypeMsg;
+
+    @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
+    private Integer fundType;
+
+    @ApiModelProperty("资金类型简介")
+    private String fundTypeMsg;
+
+    @ApiModelProperty("")
+    private Long relationId;
+
+    @ApiModelProperty("订单ID")
+    private Integer orderId;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("运单ID")
+    private Integer orderChildId;
+
+    @ApiModelProperty("运单编号")
+    private String orderChildNo;
+
+    @ApiModelProperty("变动金额")
+    @MoneyOutConvert
+    private BigDecimal alterationBalance;
+
+    @ApiModelProperty("冻结金额")
+    @MoneyOutConvert
+    private BigDecimal frozenBalance;
+
+    @ApiModelProperty("可用余额")
+    @MoneyOutConvert
+    private BigDecimal usableBalance;
+
+    @ApiModelProperty("账户余额")
+    @MoneyOutConvert
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("扣除金额")
+    @MoneyOutConvert
+    private BigDecimal takeOutBalance;
+
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

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

@@ -56,6 +56,7 @@ public class OwnerAccountVO {
     @ApiModelProperty(value = "冻结金额")
     @MoneyOutConvert
     private BigDecimal frozenBalance;
+
     /**
      * 创建人
      */

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

@@ -58,6 +58,8 @@ public class CarrierPageSettlementDriverVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "预付运费金额")
     private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "预付运费标示  0:未预付 1：已预付")
+    private Integer prepayFreightFlag;
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;

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

+package com.clx.performance.component;
+
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.model.settle.SettlementOwner;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.feign.transport.OwnerSettlementSyncParam;
+import com.clx.user.feign.OwnerFeign;
+import com.msl.common.dto.HttpDTO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+import java.util.List;
+
+@Component
+@Slf4j
+@AllArgsConstructor
+public class NetworkSyncComponent {
+
+    private final TransportFeignService transportFeignService;
+
+    private final OwnerFeign ownerFeign;
+
+
+    public void ownerSettlementSync(SettlementOwner settlementOwner, List<SettlementOwnerDetail> settlementOwnerDetailList){
+        //TODO 通知网络货运做货主计费开票标识通知
+        OwnerSettlementSyncParam param = new OwnerSettlementSyncParam();
+        String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile();
+        param.setOwnerMobile(mobile);
+        List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
+        for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
+            String childNo = settlementOwnerDetail.getChildNo();
+            OwnerSettlementSyncParam.SettlementItem  item = new OwnerSettlementSyncParam.SettlementItem();
+            item.setChildNo(childNo);
+            item.setSettlementNo(settlementOwnerDetail.getSettlementNo());
+            settlementList.add(item);
+        }
+        param.setSettlementList(settlementList);
+        HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("通知网络货运做货主计费开票标识通知请求解密后：{}", decrypt);
+    }
+}

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

@@ -11,16 +11,19 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
+import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.user.enums.driver.DriverInfoEnum;
@@ -80,6 +83,12 @@ public class OrderCancelComponent implements InitializingBean {
     @Autowired
     private OrderGoodsService orderGoodsService;
 
+    @Autowired
+    SettlementOwnerDetailDao settlementOwnerDetailDao;
+
+    @Autowired
+    OwnerAccountService ownerAccountService;
+
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
@@ -108,6 +117,19 @@ public class OrderCancelComponent implements InitializingBean {
                     orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
                             ids);
                 }
+                //1网运单 2普通单
+                Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+                log.info("invoiceType={}", invoiceType);
+                ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+                if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                    thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+                } else {
+                    thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+                }
+                thawAccountParam.setOrderNo(orderNo);
+                log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+                ownerAccountService.ownerAccountThaw(thawAccountParam);
                 break;
             case 2: //取消未拉运吨数的货单
                 log.info("2:货主取消未拉运吨数的货单");

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

+package com.clx.performance.component;
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.msl.common.dto.HttpDTO;
+import com.msl.common.result.Result;
+import com.msl.common.utils.EncryptUtil;
+import com.msl.common.utils.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.security.GeneralSecurityException;
+
+@Slf4j
+public class ThirdComponent {
+
+    public static final String TRANSPORT_USER = "13403503399";
+    public static final String TRANSPORT_KEY = "9Y1N5AUP8N2TI359";
+
+
+    public static String encrypt(String param){
+
+        HttpDTO httpDTO = null;
+        try {
+            httpDTO = EncryptUtil.buildDTO(TRANSPORT_USER, param, TRANSPORT_KEY, System.currentTimeMillis());
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+        return JSONUtil.parse(httpDTO).toString();
+
+    }
+
+    public static String decrypt(String data) {
+        try {
+            String decrypt = EncryptUtil.decrypt(data, TRANSPORT_KEY);
+            log.info("解密：{}", decrypt);
+            return decrypt;
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+}

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

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.NetworkDriverPageParam;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
+import com.clx.user.vo.feign.WalletResidueCardVO;
+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.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/app/driver")
+@Validated
+@AllArgsConstructor
+@Api(tags = "APP-司机资金管理")
+public class AppDriverAccountController {
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+    private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
+
+
+    @ApiOperation(value = "APP司机账户", notes = "<br>By:胡宇帆")
+    @GetMapping("/account")
+    @UnitCovert(param = false)
+    public Result<WalletResidueCardVO> account(@RequestParam(value = "userCode") Integer userCode) {
+        WalletResidueCardVO walletResidueCardVO = networkDriverAccountService.account(userCode);
+        return Result.ok(walletResidueCardVO);
+    }
+
+    @ApiOperation(value = "APP司机账户冻结明细", notes = "<br>By:胡宇帆")
+    @PostMapping("/frozenList")
+    @UnitCovert(param = false)
+    public Result<PageData<APPNetworkDriverRunningWaterRecordVO>> frozenList(@RequestBody NetworkDriverPageParam param) {
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.pageFrozenList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "APP司机账户流水明细", notes = "<br>By:胡宇帆")
+    @PostMapping("/runningWaterList")
+    @UnitCovert(param = false)
+    public Result<PageData<APPNetworkDriverRunningWaterRecordVO>> runningWaterList(@RequestBody NetworkDriverPageParam param) {
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.runningWaterList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+}

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

+package com.clx.performance.controller.feign;
+
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.msl.common.result.Result;
+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/driver")
+@Validated
+@AllArgsConstructor
+public class DriverAccountFeignController {
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+
+    @ApiOperation(value = "创建司机网络货运账户", notes = "<br>By:胡宇帆")
+    @PostMapping("/createNetworkDriverAccount")
+    public Result<Object> createNetworkDriverAccount(@RequestBody NetworkDriverAccountParam param) {
+        log.info("进行创建司机网络货运账户,相关参数{}", JSONUtil.parse(param).toString());
+        networkDriverAccountService.createNetworkDriverAccount(param);
+        return Result.ok();
+    }
+
+}

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

@@ -5,6 +5,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.LastTruckService;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.child.FeignOrderChildService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -30,6 +31,8 @@ public class OrderChildFeignController {
 
     private final LastTruckService lastTruckService;
 
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
 
     @GetMapping({"/getOrderChildTotalByUserNo"})
     Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo) {
@@ -53,6 +56,16 @@ public class OrderChildFeignController {
         }
     }
 
+    @GetMapping({"/selectInTransitOrderChildLtUnsettle"})
+    Result<Boolean> selectInTransitOrderChildLtUnsettle(@RequestParam("orderNo") String orderNo) {
+        List<OrderChild> orderChildren = orderChildService.selectInTransitOrderChildLtUnsettle(orderNo);
+        if (CollectionUtil.isNotEmpty(orderChildren)) {
+            return Result.ok(true);
+        } else {
+            return Result.ok(false);
+        }
+    }
+
     @ApiOperation(value = "线路运单统计", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/lineStatistics", method = RequestMethod.GET)
     Result<OrderChildLineStatisticsVO> lineStatistics(@RequestParam @NotNull(message = "发货地址不可为空") Integer sendSystemAddressId,
@@ -69,4 +82,10 @@ public class OrderChildFeignController {
 
     }
 
+    @ApiOperation(value = "获取当前订单是否有存在网运单", notes = "<br>By:胡宇帆")
+    @GetMapping({"/getInvoiceType"})
+    Result<Integer> getInvoiceType(@RequestParam("orderNo") @NotNull(message = "订单编号不能为空") String orderNo) {
+        return Result.ok(settlementOwnerDetailService.getInvoiceType(orderNo));
+    }
+
 }

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

+package com.clx.performance.controller.feign;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+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.NotNull;
+import java.util.List;
+
+@RestController
+@RequestMapping("/feign/settlement")
+@Validated
+@Api(tags = "货单Feign")
+@AllArgsConstructor
+public class SettlementFeignController {
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+
+    @GetMapping({"/thawAndLockSettlement"})
+    Result<Boolean> selectListByOrderNo(@RequestParam("orderNo") @NotNull(message = "订单号不能为空") String orderNo) {
+        return Result.ok(settlementOwnerDetailService.thawAndLockSettlement(orderNo));
+
+    }
+
+}

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

@@ -2,26 +2,27 @@ package com.clx.performance.controller.pc;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.param.pc.ArtificialCancelOrderParam;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildCancelRecordParam;
-import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.service.OrderCancelService;
+import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.vo.app.OrderChildVO;
-import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
-import com.msl.common.base.PageParam;
-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.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Slf4j
 @RestController
 @RequestMapping(value="/pc/order/")
@@ -32,6 +33,7 @@ public class OrderCancelController {
 
     private final OrderCancelService orderCancelService;
 
+
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/platformCancelOrderPre")
     public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
@@ -67,4 +69,6 @@ public class OrderCancelController {
         IPage<OrderChildVO> page = orderCancelService.orderChildCancelRecord(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+
 }

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

@@ -111,7 +111,6 @@ public class CarrierSettlementOwnerController {
     @ApiOperation(value = "编辑结算单状态",notes = "<br>By:姜文业")
     @PostMapping("/updateStatusByOrderNo")
     public Result updateStatusByOrderNo(@RequestBody @Validated UpdateStatusParam param) {
-        log.info("履约服务进行结算单状态更改，参数{}", JSONUtil.parse(param));
         settlementOwnerService.updateStatusByOrderNo(param.getOrderNo(), param.getSettlementPeriodType(), param.getFromStatus(), param.getToStatus());
         return Result.ok();
     }

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

+package com.clx.performance.controller.pc.driver;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.*;
+import com.clx.performance.service.settle.NetworkCaseOutRecordService;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
+import com.clx.performance.vo.pc.*;
+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.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/pc/driver")
+@Validated
+@AllArgsConstructor
+@Api(tags = "PC-车主网络货运")
+public class NetworkDriverAccountController {
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+    private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
+
+    private final NetworkCaseOutRecordService networkCaseOutRecordService;
+
+
+
+    @ApiOperation(value = "网络货运账户列表", notes = "<br>By:胡宇帆")
+    @PostMapping("/networkAccountList")
+    @UnitCovert(param = false)
+    public Result<PageData<NetworkDriverAccountVO>> networkAccountList(@RequestBody PageNetworkAccountListParam param) {
+        IPage<NetworkDriverAccountVO> page = networkDriverAccountService.networkAccountList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+    @ApiOperation(value = "网络货运账户详情", notes = "<br>By:胡宇帆")
+    @PostMapping("/networkAccountInfoList")
+    @UnitCovert(param = false)
+    public Result<PageData<NetworkDriverRunningWaterRecordVO>> networkAccountInfoList(@RequestBody PageNetworkAccountInfoListParam param) {
+        IPage<NetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordService.networkDriverRunningWaterRecordList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "车主提现", notes = "<br>By:胡宇帆")
+    @PostMapping("/networkCaseOutRecord")
+    @UnitCovert(param = false)
+    public Result<PageData<NetworkCaseOutRecordVO>> networkCaseOutRecord(@RequestBody PageNetworkCaseOutRecordListParam param) {
+        IPage<NetworkCaseOutRecordVO> page = networkCaseOutRecordService.networkCaseOutRecord(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+}

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

+package com.clx.performance.controller.pc.transport;
+
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dto.InvoicingStatusNotifyDTO;
+import com.clx.performance.dto.OrderChildSyncDTO;
+import com.clx.performance.dto.PayStatusNotifyDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+import com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam;
+import com.clx.performance.service.TransportSyncService;
+import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import com.msl.common.dto.HttpDTO;
+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/transport/")
+@Validated
+@Api(tags = "PC-网络货运相关")
+@AllArgsConstructor
+public class TransportSyncController {
+
+
+    private final TransportSyncService transportSyncService;
+
+    private final OrderChildDao orderChildDao;
+
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
+    private final TransportFeignService transportFeignService;
+
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
+
+    private final OrderChildSyncTransportRecordService orderChildSyncTransportRecordService;
+
+    private final SettlementOwnerService settlementOwnerService;
+
+    /**
+     * 支付结果
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "payStatusNotify", notes = "<br>By:胡宇帆")
+    @PostMapping("/payStatusNotify")
+    public Object payStatusNotify(@RequestBody String param) {
+        HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
+        log.info("payStatusNotify 原始报文：{}", bean);
+        String decrypt = ThirdComponent.decrypt(bean.getData());
+        log.info("payStatusNotify 解密后：{}", decrypt);
+        PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, PayStatusNotifyDTO.class);
+        log.info("支付回调payStatusNotifyDTO:{}", JSONUtil.parse(payStatusNotifyDTO));
+        orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
+        return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
+    }
+
+    /**
+     * 开票结果
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "invoicingStatusNotify", notes = "<br>By:胡宇帆")
+    @PostMapping("/invoicingStatusNotify")
+    public Object invoicingStatusNotify(@RequestBody String param) {
+        HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
+        log.info("invoicingStatusNotify 原始报文：{}", bean);
+        String decrypt = ThirdComponent.decrypt(bean.getData());
+        log.info("invoicingStatusNotify 解密后：{}", decrypt);
+        InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, InvoicingStatusNotifyDTO.class);
+        settlementOwnerService.invoicingStatusNotify(invoicingStatusNotifyDTO);
+        return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
+    }
+
+    /**
+     * 风控结果
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "riskStatusNotify", notes = "<br>By:艾庆国")
+    @PostMapping("/riskStatusNotify")
+    public Object riskStatusNotify(@RequestBody String param) {
+        HttpDTO bean = JSONUtil.toBean(param, HttpDTO.class);
+        log.info("riskStatusNotify 原始报文：{}", bean);
+        String decrypt = ThirdComponent.decrypt(bean.getData());
+        log.info("riskStatusNotify 解密后：{}", decrypt);
+        ThirdOrderChildRiskStatusParam invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, ThirdOrderChildRiskStatusParam.class);
+
+        return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
+    }
+
+
+    @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
+    @GetMapping("/syncTest")
+    public Result<OrderChildSyncDTO> syncTest(@RequestParam String childNo) {
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+        log.info("=======================生成Param{}", JSONUtil.parse(param));
+        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
+        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
+        return Result.ok(bean);
+    }
+
+
+}

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

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.extranal.transport.TransportService;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
+import com.clx.performance.param.feign.transport.OwnerSettlementSyncParam;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 
@@ -30,6 +33,10 @@ public class TempController {
     private TempService tempService;
     @Autowired
     private FeignOrderChildService carrierOrderChildService;
+    @Autowired
+    private TransportService transportService;
+    @Autowired
+    private TransportFeignService transportFeignService;
 
 
 
@@ -69,4 +76,37 @@ public class TempController {
 
         return Result.ok();
     }
+
+
+//    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
+//    @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
+//    public Result<Void> orderChildSync(@RequestBody ThirdOrderChildBrokerParam param1) {
+//        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
+//        param.setChildNo("123");
+//
+//        transportService.orderChildSync(param);
+//
+//        return Result.ok();
+//    }
+
+    @ApiOperation(value = "运单支付运费同步 (临时接口)", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderChildPaySync", method = RequestMethod.POST)
+    public Result<Void> orderChildPaySync(@RequestBody OrderChildPaySyncParam param) {
+
+        HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("{}", decrypt);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单同步 (临时接口)", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/ownerSettlementSync", method = RequestMethod.POST)
+    public Result<Void> ownerSettlementSync(@RequestBody OwnerSettlementSyncParam param) {
+
+        HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("{}", decrypt);
+        return Result.ok();
+    }
+
 }

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

@@ -117,6 +117,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
+    List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo);
+
     /**
      * 通过货单号查询在途运单
      * @param orderGoodsNo

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

@@ -33,4 +33,7 @@ public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRec
     List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo);
 
     List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param);
+
+    OwnerRunningWaterRecord getOneByOrderNoAndRunningWaterTypeAndAccountType(String orderNo, Integer runningWaterType, Integer accountType);
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -378,6 +378,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo, orderNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
+        );
+    }
+
     @Override
     public List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerRunningWaterRecordDaoImpl.java

@@ -56,8 +56,8 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
     @Override
     public List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo) {
         return baseMapper.selectList(lQrWrapper().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
-                        .eq(OwnerRunningWaterRecord::getRunningWaterType, OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
-                .isNull(OwnerRunningWaterRecord::getOrderChildNo)
+//                        .eq(OwnerRunningWaterRecord::getRunningWaterType, OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
+                //.isNull(OwnerRunningWaterRecord::getOrderChildNo)
         );
     }
 
@@ -65,4 +65,12 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
     public List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param) {
         return baseMapper.marginAccountList(param);
     }
+
+    @Override
+    public OwnerRunningWaterRecord getOneByOrderNoAndRunningWaterTypeAndAccountType(String orderNo, Integer runningWaterType, Integer accountType) {
+        return baseMapper.selectOne(lQrWrapper().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
+                .eq(OwnerRunningWaterRecord::getRunningWaterType, runningWaterType)
+                .eq(OwnerRunningWaterRecord::getAccountType, accountType)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkCaseOutRecordDaoImpl.java

+package com.clx.performance.dao.impl.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
+import com.clx.performance.mapper.settle.NetworkCaseOutRecordMapper;
+import com.clx.performance.model.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Repository
+public class NetworkCaseOutRecordDaoImpl extends BaseDaoImpl<NetworkCaseOutRecordMapper, NetworkCaseOutRecord, Integer> implements NetworkCaseOutRecordDao {
+
+    @Override
+    public IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param) {
+        Page<OwnerAccountVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.networkCaseOutRecord(page, param);
+    }
+
+    @Override
+    public void updateStatus(String childNo, Integer code, String msg) {
+        update(lUdWrapper().eq(NetworkCaseOutRecord::getChildNo, childNo)
+                .set(NetworkCaseOutRecord::getStatus, code)
+                .set(NetworkCaseOutRecord::getFinishTime, LocalDateTime.now())
+                .set(NetworkCaseOutRecord::getStatusMsg, msg)
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkDriverAccountDaoImpl.java

+package com.clx.performance.dao.impl.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.NetworkDriverAccountDao;
+import com.clx.performance.mapper.settle.NetworkDriverAccountMapper;
+import com.clx.performance.model.settle.NetworkDriverAccount;
+import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import com.msl.common.utils.DateUtils;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Repository
+public class NetworkDriverAccountDaoImpl extends BaseDaoImpl<NetworkDriverAccountMapper, NetworkDriverAccount, Integer> implements NetworkDriverAccountDao {
+
+    @Override
+    public IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param) {
+        Page<NetworkDriverAccountVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.networkAccountList(page, param);
+    }
+
+    public Integer updateAccountCAS(NetworkDriverAccount account, LocalDateTime now, boolean flag) {
+        String nowStr = DateUtils.formatDateTime(now).get();
+        if (flag) {
+            return baseMapper.addAccount(account, nowStr);
+        } else {
+            return baseMapper.subAccount(account, nowStr);
+        }
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/NetworkDriverRunningWaterRecordDaoImpl.java

+package com.clx.performance.dao.impl.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.NetworkDriverRunningWaterRecordDao;
+import com.clx.performance.enums.NetworkDriverAccountEnum;
+import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
+import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
+import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
+import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Repository
+public class NetworkDriverRunningWaterRecordDaoImpl extends BaseDaoImpl<NetworkDriverRunningWaterRecordMapper, NetworkDriverRunningWaterRecord, Integer> implements NetworkDriverRunningWaterRecordDao {
+
+
+    @Override
+    public IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(PageNetworkAccountInfoListParam param) {
+        Page<NetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.networkDriverRunningWaterRecordDao(page, param);
+    }
+
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param) {
+        Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageFrozenList(page, param);
+    }
+
+    @Override
+    public IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param) {
+        Page<APPNetworkDriverRunningWaterRecordVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.runningWaterList(page, param);
+    }
+
+    @Override
+    public void updateFrozenFlagByChildNo(String childNo) {
+        update(lUdWrapper().set(NetworkDriverRunningWaterRecord::getFrozenFlag, 1)
+                .eq(NetworkDriverRunningWaterRecord::getChildNo, childNo)
+                .eq(NetworkDriverRunningWaterRecord::getRunningWaterType, NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode())
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/OrderChildSyncTransportRecordDaoImpl.java

+package com.clx.performance.dao.impl.settle;
+
+
+import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
+import com.clx.performance.mapper.settle.OrderChildSyncTransportRecordMapper;
+import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author kavin
+ * Date 2023-12-08
+ * Time 11:42
+ */
+@Repository
+public class OrderChildSyncTransportRecordDaoImpl extends BaseDaoImpl<OrderChildSyncTransportRecordMapper, OrderChildSyncTransportRecord, Integer> implements OrderChildSyncTransportRecordDao {
+
+    @Override
+    public List<OrderChildSyncTransportRecord> selectListForJob() {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChildSyncTransportRecord::getStatus, 0));
+    }
+
+    @Override
+    public void updateStatus(String childNo) {
+        update(lUdWrapper().eq(OrderChildSyncTransportRecord::getChildNo, childNo)
+                .set(OrderChildSyncTransportRecord::getStatus, 2)
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -25,10 +25,12 @@ import java.util.Objects;
 @Repository
 public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> implements SettlementDriverDetailDao {
     @Override
-    public boolean updateInvoiceType(SettlementDriverDetail item) {
+    public boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item) {
         return update(lUdWrapper()
                 .eq(SettlementDriverDetail::getId, item.getId())
                 .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
+                .set(SettlementDriverDetail::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -66,6 +66,14 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         );
     }
 
+    @Override
+    public boolean updateInvoiceStatusBySettlementNo(String settlementNo, Integer invoiceStatus) {
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getSettlementNo, settlementNo)
+                .set(SettlementOwner::getInvoiceStatus, invoiceStatus)
+        );
+    }
+
     @Override
     public boolean updateInvoiceStatusById(Integer id, Integer invoiceStatus){
         return update(lUdWrapper()

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
@@ -30,6 +32,9 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return update(lUdWrapper()
                 .eq(SettlementOwnerDetail::getId, item.getId())
                 .set(SettlementOwnerDetail::getInvoiceType, item.getInvoiceType())
+                .set(SettlementOwnerDetail::getInvoiceFreight, item.getInvoiceFreight())
+                .set(SettlementOwnerDetail::getSettlementFreight, item.getSettlementFreight())
+                .set(SettlementOwnerDetail::getFinalPaymentStatus, item.getFinalPaymentStatus())
                 .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
         );
     }
@@ -71,6 +76,14 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return list(lQrWrapper().eq(SettlementOwnerDetail::getSettlementNo, settlementNo));
     }
 
+    @Override
+    public List<SettlementOwnerDetail> getBySettlementNoAndInvoiceType(String settlementNo, Integer invoiceType, Integer invoiceStatus) {
+        return list(lQrWrapper().eq(SettlementOwnerDetail::getSettlementNo, settlementNo)
+                .eq(SettlementOwnerDetail::getInvoiceType, invoiceType)
+                .eq(SettlementOwnerDetail::getInvoiceStatus, invoiceStatus)
+        );
+    }
+
 
     @Override
     public IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(
@@ -92,6 +105,36 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
 
+    @Override
+    public Integer getInvoiceType(String orderNo) {
+        return baseMapper.getInvoiceType(orderNo);
+    }
+
+    @Override
+    public void updateSettlementByChildNoList(List<String> childNoList) {
+         update(lUdWrapper()
+                .in(SettlementOwnerDetail::getChildNo, childNoList)
+                .set(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())
+        );
+    }
+
+    @Override
+    public void updateFinalPaymentStatusBySettlementNoForOnline(String settlementNo, Integer finalPaymentStatus) {
+        update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getSettlementNo, settlementNo)
+                .eq(SettlementOwnerDetail::getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode())
+                .set(SettlementOwnerDetail::getFinalPaymentStatus, finalPaymentStatus)
+
+        );
+    }
+
+    @Override
+    public List<SettlementOwnerDetail> selectListByOrderNo(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(SettlementOwnerDetail::getOrderNo, orderNo)
+                .isNull(SettlementOwnerDetail::getSettlementNo)
+        );
+    }
+
     @Override
     public IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
         LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkCaseOutRecordDao.java

+package com.clx.performance.dao.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.settle.NetworkCaseOutRecordMapper;
+import com.clx.performance.model.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkCaseOutRecordDao extends BaseDao<NetworkCaseOutRecordMapper, NetworkCaseOutRecord, Integer> {
+
+
+    IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param);
+
+    void updateStatus(String childNo, Integer code, String msg);
+}

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkDriverAccountDao.java

+package com.clx.performance.dao.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.settle.NetworkDriverAccountMapper;
+import com.clx.performance.model.settle.NetworkDriverAccount;
+import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import com.msl.common.dao.BaseDao;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkDriverAccountDao extends BaseDao<NetworkDriverAccountMapper, NetworkDriverAccount, Integer> {
+
+
+    IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param);
+
+    Integer updateAccountCAS(NetworkDriverAccount account, LocalDateTime now, boolean flag);
+}

performance-web/src/main/java/com/clx/performance/dao/settle/NetworkDriverRunningWaterRecordDao.java

+package com.clx.performance.dao.settle;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.settle.NetworkDriverRunningWaterRecordMapper;
+import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
+import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
+import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkDriverRunningWaterRecordDao extends BaseDao<NetworkDriverRunningWaterRecordMapper, NetworkDriverRunningWaterRecord, Integer> {
+
+    IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(PageNetworkAccountInfoListParam param);
+
+    IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(NetworkDriverPageParam param);
+
+    IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param);
+
+    void updateFrozenFlagByChildNo(String childNo);
+}

performance-web/src/main/java/com/clx/performance/dao/settle/OrderChildSyncTransportRecordDao.java

+package com.clx.performance.dao.settle;
+
+
+import com.clx.performance.mapper.settle.OrderChildSyncTransportRecordMapper;
+import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * @author kavin
+ * Date 2023-12-08
+ * Time 11:42
+ */
+public interface OrderChildSyncTransportRecordDao extends BaseDao<OrderChildSyncTransportRecordMapper, OrderChildSyncTransportRecord, Integer> {
+
+
+    List<OrderChildSyncTransportRecord> selectListForJob();
+
+    void updateStatus(String childNo);
+}

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> {
 
-    boolean updateInvoiceType(SettlementDriverDetail item);
+    boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item);
     boolean updateSettlementNo(SettlementDriverDetail item);
 
 

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -22,6 +22,9 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
 
     boolean updateStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("status")Integer status);
 
+    boolean updateInvoiceStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("status")Integer status);
+
+
     boolean updateInvoiceStatusById(@Param("id")Integer id, @Param("invoiceStatus")Integer invoiceStatus);
 
     boolean updatePayment(SettlementOwner settlementOwner);

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java

@@ -30,7 +30,18 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
     Optional<SettlementOwnerDetail> getByChildNo(String childNo);
     List<SettlementOwnerDetail> getBySettlementNo(String settlementNo);
 
+    List<SettlementOwnerDetail> getBySettlementNoAndInvoiceType(String settlementNo, Integer invoiceType, Integer invoiceStatus);
+
+
     IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
     IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
+
+    Integer getInvoiceType(String orderNo);
+
+    void updateSettlementByChildNoList(List<String> childNoList);
+
+    void updateFinalPaymentStatusBySettlementNoForOnline(String settlementNo, Integer finalPaymentStatus);
+
+    List<SettlementOwnerDetail> selectListByOrderNo(String orderNo);
 }

performance-web/src/main/java/com/clx/performance/dto/InvoicingStatusNotifyDTO.java

+package com.clx.performance.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InvoicingStatusNotifyDTO {
+
+    List<String> childNoList;
+
+}

performance-web/src/main/java/com/clx/performance/dto/OrderChildSyncDTO.java

+package com.clx.performance.dto;
+
+import lombok.Data;
+
+@Data
+public class OrderChildSyncDTO {
+
+    private Integer code;
+
+    private OrderChildSyncResultDTO data;
+
+}

performance-web/src/main/java/com/clx/performance/dto/OrderChildSyncResultDTO.java

+package com.clx.performance.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderChildSyncResultDTO {
+
+    @Data
+    class Res {
+        private String msg;
+
+        private String type;
+    }
+
+
+    private List<Res> riskList;
+
+    //1: 通过风控  0：未通过风控
+    private Integer status;
+
+}

performance-web/src/main/java/com/clx/performance/dto/PayStatusNotifyDTO.java

+package com.clx.performance.dto;
+
+import lombok.Data;
+
+@Data
+public class PayStatusNotifyDTO {
+
+    private String childNo;
+}

performance-web/src/main/java/com/clx/performance/extranal/transport/TransportService.java

+package com.clx.performance.extranal.transport;
+
+import com.clx.performance.param.feign.transport.OwnerLegalSyncParam;
+import com.clx.performance.param.feign.transport.OwnerPersonalSyncParam;
+import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
+
+public interface TransportService {
+
+    ThirdOrderChildBrokerResultVO orderChildSync(ThirdOrderChildBrokerParam param);
+
+    Integer ownerLegalSync(OwnerLegalSyncParam param);
+
+    Integer ownerPersonalSync(OwnerPersonalSyncParam param);
+
+    boolean ownerExistCheck(String mobile);
+
+    Integer getOwnerId(String mobile);
+}

performance-web/src/main/java/com/clx/performance/extranal/transport/impl/TransportServiceImpl.java

+package com.clx.performance.extranal.transport.impl;
+
+import com.clx.performance.extranal.transport.TransportService;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.param.feign.transport.OwnerLegalSyncParam;
+import com.clx.performance.param.feign.transport.OwnerPersonalSyncParam;
+import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
+import com.msl.common.base.Optional;
+import com.msl.common.enums.ResultCodeEnum;
+import com.msl.common.result.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class TransportServiceImpl implements TransportService {
+
+    @Autowired
+    private TransportFeignService transportFeignService;
+
+
+    @Override
+    public ThirdOrderChildBrokerResultVO orderChildSync(ThirdOrderChildBrokerParam param) {
+//        return Optional.ofNullable(transportFeignService.orderChildSync(param))
+//                .filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL).getData();
+        return null;
+    }
+
+    @Override
+    public Integer ownerLegalSync(OwnerLegalSyncParam param) {
+        return Optional.ofNullable(transportFeignService.ownerLegalSync(param))
+                .filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL).getData();
+
+    }
+
+    @Override
+    public Integer ownerPersonalSync(OwnerPersonalSyncParam param) {
+        return Optional.ofNullable(transportFeignService.ownerPersonalSync(param))
+                .filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL).getData();
+
+    }
+
+    @Override
+    public boolean ownerExistCheck(String mobile) {
+        return Optional.ofNullable(transportFeignService.ownerExistCheck(mobile))
+                .filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL).getData() == 1;
+
+    }
+
+    @Override
+    public Integer getOwnerId(String mobile) {
+        return Optional.ofNullable(transportFeignService.getOwnerId(mobile))
+                .filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL).getData();
+
+    }
+
+}

performance-web/src/main/java/com/clx/performance/feign/FeignInterceptor.java

+package com.clx.performance.feign;
+
+import com.clx.performance.component.ThirdComponent;
+import com.msl.common.result.Result;
+import feign.Request;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+
+@Slf4j
+public class FeignInterceptor implements RequestInterceptor {
+
+
+
+  @Override
+  public void apply(RequestTemplate template){
+    // 通过template获取到请求体（已经被转成json）
+    String jsonBody = template.requestBody().asString();
+    log.info("请求参数：{}", jsonBody);
+    try {
+      //调用网络货运请求需要加密处理
+      jsonBody = ThirdComponent.encrypt(jsonBody);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    template.body(jsonBody);
+  }
+
+  @Bean
+  public Request.Options requestOptions() {
+    return new Request.Options(30000, 30000);
+  }
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/feign/TransportFeignService.java

+package com.clx.performance.feign;
+
+import com.clx.performance.param.feign.transport.*;
+import com.msl.common.dto.HttpDTO;
+import com.msl.common.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@FeignClient(name = "transport-service-yitu", url = "${transport-service.host}", configuration = FeignInterceptor.class)
+public interface TransportFeignService {
+
+    /**
+     * 运单同步
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/orderChildSync", method = RequestMethod.POST)
+    HttpDTO orderChildSync(@RequestBody ThirdOrderChildBrokerParam param);
+
+    /**
+     * 获取风控状态
+     * @return
+     * @see com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/getRiskStatus", method = RequestMethod.POST)
+    HttpDTO getRiskStatus(@RequestBody @NotBlank(message = "运单编号不能为空") String childNo);
+
+    /**
+     * 运单支付运费同步
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/orderChildPaySync", method = RequestMethod.POST)
+    HttpDTO orderChildPaySync(@RequestBody OrderChildPaySyncParam param);
+
+    /**
+     * 获取运单开票状态
+     * @return 0-未申请，10-已申请，20-审核失败，30-已开票
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/getInvoiceStatus", method = RequestMethod.POST)
+    Result<Integer> getInvoiceStatus(@RequestBody @NotBlank(message = "运单编号不能为空") String childNo);
+
+    /**
+     * 货主结算单同步 (只推同一货主)
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/order/ownerSettlementSync", method = RequestMethod.POST)
+    HttpDTO ownerSettlementSync(@RequestBody OwnerSettlementSyncParam param);
+
+    /**
+     * 货主同步(法人模式)
+     * @return 货主用户id
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/owner/ownerLegalSync", method = RequestMethod.POST)
+    Result<Integer> ownerLegalSync(@RequestBody OwnerLegalSyncParam param);
+
+    /**
+     * 货主同步(自然人模式)
+     * @return 货主用户id
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/owner/ownerPersonalSync", method = RequestMethod.POST)
+    Result<Integer> ownerPersonalSync(@RequestBody OwnerPersonalSyncParam param);
+
+    /**
+     * 检测货主是否注册
+     * @return 0不存在 1存在
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/owner/ownerExistCheck", method = RequestMethod.POST)
+    Result<Integer> ownerExistCheck(@Validated @NotBlank(message = "手机不能为空") String mobile);
+
+    /**
+     * 获取货主用户id
+     * @Return null未注册
+     */
+    @RequestMapping(value = "/transport-service/thirdParty/owner/getOwnerId", method = RequestMethod.POST)
+    Result<Integer> getOwnerId(@Validated @NotBlank(message = "手机不能为空") String mobile);
+
+}

performance-web/src/main/java/com/clx/performance/job/NetworkDriverAccountSyncJob.java

+package com.clx.performance.job;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.clx.user.feign.DriverFeign;
+import com.clx.user.vo.pc.driver.user.DriverInfoVo;
+import com.msl.common.result.Result;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class NetworkDriverAccountSyncJob {
+
+
+    private final DriverFeign driverFeign;
+
+    private final NetworkDriverAccountService networkDriverAccountService;
+
+
+
+    /**
+     * 网络货运同步司机账户信息
+     */
+    @XxlJob("networkDriverAccountSync")
+    public void networkDriverAccountSync() {
+        Result<List<DriverInfoVo>> result = driverFeign.getDriverInfoList();
+        List<DriverInfoVo> data = result.getData();
+        log.info("查询出所有司机信息:{}", JSONUtil.parse(data));
+        for (DriverInfoVo vo : data) {
+            if (ObjectUtil.isNull(vo.getUserNo())) {
+                continue;
+            }
+            NetworkDriverAccountParam param = new NetworkDriverAccountParam();
+            param.setDriverUserName(vo.getName());
+            param.setDriverUserNo(vo.getUserNo());
+            param.setMobile(vo.getMobile());
+            try {
+                Thread.sleep(2000L);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            networkDriverAccountService.createNetworkDriverAccount(param);
+
+        }
+
+    }
+}

performance-web/src/main/java/com/clx/performance/job/OrderChildPaySyncTransportJob.java

+package com.clx.performance.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
+import com.clx.performance.dto.OrderChildSyncDTO;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
+import com.msl.common.dto.HttpDTO;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class OrderChildPaySyncTransportJob {
+
+    private final OrderChildSyncTransportRecordDao orderChildSyncTransportRecordDao;
+
+    private final TransportFeignService transportFeignService;
+
+    /**
+     * 同步网络货运
+     */
+    @XxlJob("orderChildPaySyncTransportJob")
+    public void orderChildPaySyncTransportJob() {
+        List<OrderChildSyncTransportRecord> recordList  = orderChildSyncTransportRecordDao.selectListForJob();
+        if (CollectionUtil.isEmpty(recordList)) {
+            return;
+        }
+
+        List<String> orderChilList = recordList.stream().map(OrderChildSyncTransportRecord::getChildNo).collect(Collectors.toList());
+        OrderChildPaySyncParam param = new OrderChildPaySyncParam();
+        param.setChildNoList(orderChilList);
+        HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
+        if (bean.getCode() == 0) {
+            for (OrderChildSyncTransportRecord record : recordList) {
+                OrderChildSyncTransportRecord update = new OrderChildSyncTransportRecord();
+                update.setId(record.getId());
+                update.setStatus(1);
+                orderChildSyncTransportRecordDao.updateEntityByKey(update);
+            }
+        }
+
+    }
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkCaseOutRecordMapper.java

+package com.clx.performance.mapper.settle;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.settle.NetworkCaseOutRecord;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.sqlProvider.settle.NetworkCaseOutRecordProvider;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import org.apache.ibatis.annotations.SelectProvider;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkCaseOutRecordMapper extends BaseMapper<NetworkCaseOutRecord> {
+
+
+    @SelectProvider(type = NetworkCaseOutRecordProvider.class, method = "networkCaseOutRecord")
+    IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(Page<OwnerAccountVO> page, PageNetworkCaseOutRecordListParam param);
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkDriverAccountMapper.java

+package com.clx.performance.mapper.settle;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.settle.NetworkDriverAccount;
+import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.sqlProvider.settle.NetworkDriverAccountProvider;
+import com.clx.performance.vo.pc.IntegralRecordVO;
+import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkDriverAccountMapper extends BaseMapper<NetworkDriverAccount> {
+
+    @SelectProvider(type = NetworkDriverAccountProvider.class, method = "networkAccountList")
+    IPage<NetworkDriverAccountVO> networkAccountList(@Param("page")Page<NetworkDriverAccountVO> page, @Param("param")PageNetworkAccountListParam param);
+
+    @Update("update network_driver_account set usable_balance = usable_balance + #{account.usableBalance}"
+            + ",account_balance = account_balance + #{account.accountBalance}"
+            + ",modified_time= #{now}"
+            + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
+    )
+    Integer addAccount(@Param("account") NetworkDriverAccount account, @Param("now") String now);
+
+    @Update("update network_driver_account set usable_balance = usable_balance - #{account.usableBalance}," +
+            "frozen_balance = frozen_balance + #{account.frozenBalance},account_balance = account_balance - #{account.accountBalance}," +
+            "modified_time=#{now}"
+            + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
+    )
+    Integer subAccount(@Param("account") NetworkDriverAccount account, @Param("now") String now);
+
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/NetworkDriverRunningWaterRecordMapper.java

+package com.clx.performance.mapper.settle;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.settle.NetworkDriverRunningWaterRecord;
+import com.clx.performance.param.app.NetworkDriverPageParam;
+import com.clx.performance.param.pc.PageNetworkAccountInfoListParam;
+import com.clx.performance.sqlProvider.settle.NetworkDriverRunningWaterRecordProvider;
+import com.clx.performance.vo.app.APPNetworkDriverRunningWaterRecordVO;
+import com.clx.performance.vo.pc.NetworkDriverRunningWaterRecordVO;
+import org.apache.ibatis.annotations.SelectProvider;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+public interface NetworkDriverRunningWaterRecordMapper extends BaseMapper<NetworkDriverRunningWaterRecord> {
+
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "networkDriverRunningWaterRecordDao")
+    IPage<NetworkDriverRunningWaterRecordVO> networkDriverRunningWaterRecordDao(Page<NetworkDriverRunningWaterRecordVO> page, PageNetworkAccountInfoListParam param);
+
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "pageFrozenList")
+    IPage<APPNetworkDriverRunningWaterRecordVO> pageFrozenList(Page<APPNetworkDriverRunningWaterRecordVO> page, NetworkDriverPageParam param);
+
+    @SelectProvider(type = NetworkDriverRunningWaterRecordProvider.class, method = "runningWaterList")
+    IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(Page<APPNetworkDriverRunningWaterRecordVO> page, NetworkDriverPageParam param);
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/OrderChildSyncTransportRecordMapper.java

+package com.clx.performance.mapper.settle;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+
+/**
+ * @author kavin
+ * Date 2023-12-08
+ * Time 11:42
+ */
+public interface OrderChildSyncTransportRecordMapper extends BaseMapper<OrderChildSyncTransportRecord> {
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementOwnerDetailMapper.java

@@ -20,4 +20,6 @@ public interface SettlementOwnerDetailMapper extends BaseMapper<SettlementOwnerD
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(@Param("page") Page<PageOwnerSettlementOwnerDetailVO> page,
                                                                                @Param("param") PageOwnerSettlementOwnerDetailParam param);
 
+    @SelectProvider(type = SettlementOwnerDetailSqlProvider.class, method = "getInvoiceType")
+    Integer getInvoiceType(@Param("orderNo") String orderNo);
 }
\ No newline at end of file

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

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("network_case_out_record")
+@Builder
+public class NetworkCaseOutRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("case_out_no")
+    @ApiModelProperty("提现单号")
+    private Long caseOutNo;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机编码")
+    private Long driverUserNo;
+
+    @TableField("driver_user_name")
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @TableField("mobile")
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @TableField("payee")
+    @ApiModelProperty("收款人")
+    private String payee;
+
+    @TableField("bank")
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    @TableField("collection_bank_code")
+    @ApiModelProperty("收款银行账户")
+    private String collectionBankCode;
+
+    @TableField("status")
+    @ApiModelProperty("状态 10：待平台付款 20：已付款")
+    private Integer status;
+
+    @TableField("status_msg")
+    @ApiModelProperty("状态简介")
+    private String statusMsg;
+
+    @TableField("platform")
+    @ApiModelProperty("平台")
+    private String platform;
+
+    @TableField("order_no")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @TableField("order_goods_no")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("alteration_balance")
+    @ApiModelProperty("变动金额")
+    private BigDecimal alterationBalance;
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("finish_time")
+    @ApiModelProperty("提现完成时间")
+    private LocalDateTime finishTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

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

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Data
+@Accessors(chain = true)
+@TableName("network_driver_account")
+@Builder
+public class NetworkDriverAccount implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机编码")
+    private Long driverUserNo;
+
+    @TableField("driver_user_name")
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @TableField("mobile")
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @TableField("account_balance")
+    @ApiModelProperty("账户余额")
+    private BigDecimal accountBalance;
+
+    @TableField("usable_balance")
+    @ApiModelProperty("可用余额")
+    private BigDecimal usableBalance;
+
+    @TableField("frozen_balance")
+    @ApiModelProperty("冻结余额")
+    private BigDecimal frozenBalance;
+
+    @TableField("wallet_code")
+    @ApiModelProperty("钱包code")
+    private String walletCode;
+
+    @TableField("create_by")
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

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

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("network_driver_running_water_record")
+@Builder
+public class NetworkDriverRunningWaterRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("running_water_no")
+    @ApiModelProperty("流水号")
+    private Long runningWaterNo;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机编码")
+    private Long driverUserNo;
+
+    @TableField("driver_user_name")
+    @ApiModelProperty("司机名称")
+    private String driverUserName;
+
+    @TableField("mobile")
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @TableField("running_water_type")
+    @ApiModelProperty("流水类型 10：运单结算 20：提现冻结 30：提现成功")
+    private Integer runningWaterType;
+
+    @TableField("running_water_type_msg")
+    @ApiModelProperty("流水类型简介")
+    private String runningWaterTypeMsg;
+
+    @TableField("frozen_flag")
+    @ApiModelProperty("冻结标记：如果是1代表当前冻结流水已经提现成功")
+    private Integer frozenFlag;
+
+
+    @TableField("fund_type")
+    @ApiModelProperty("资金类型 10：收入 20：冻结 30：支出")
+    private Integer fundType;
+
+    @TableField("fund_type_msg")
+    @ApiModelProperty("资金类型简介")
+    private String fundTypeMsg;
+
+    @TableField("order_no")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @TableField("order_goods_no")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("alteration_balance")
+    @ApiModelProperty("变动金额")
+    private BigDecimal alterationBalance;
+
+    @TableField("frozen_balance")
+    @ApiModelProperty("冻结金额")
+    private BigDecimal frozenBalance;
+
+    @TableField("usable_balance")
+    @ApiModelProperty("可用余额")
+    private BigDecimal usableBalance;
+
+    @TableField("account_balance")
+    @ApiModelProperty("账户余额")
+    private BigDecimal accountBalance;
+
+    @TableField("take_out_balance")
+    @ApiModelProperty("扣除金额")
+    private BigDecimal takeOutBalance;
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人")
+    private String createBy;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

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

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-08
+ * Time 11:42
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_child_sync_transport_record")
+public class OrderChildSyncTransportRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("driver_user_no")
+    @ApiModelProperty("车主用户编号")
+    private Long driverUserNo;
+
+    @TableField("driver_name")
+    @ApiModelProperty("车主名称")
+    private String driverName;
+
+    @TableField("settlement_no")
+    @ApiModelProperty("结算单号")
+    private String settlementNo;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("order_goods_no")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @TableField("order_no")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @TableField("goods_id")
+    @ApiModelProperty("货物id")
+    private Integer goodsId;
+
+    @TableField("goods_name")
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+
+    @TableField("truck_no")
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+
+    @TableField("weight")
+    @ApiModelProperty("拉运重量（单位吨）")
+    private BigDecimal weight;
+
+    @TableField("freight_price")
+    @ApiModelProperty("运费单价（分）")
+    private BigDecimal freightPrice;
+
+    @TableField("freight")
+    @ApiModelProperty("实际运费（分）")
+    private BigDecimal freight;
+
+    @TableField("loss_price")
+    @ApiModelProperty("损耗单价（分）")
+    private BigDecimal lossPrice;
+
+    @TableField("loss_weight")
+    @ApiModelProperty("货损吨数")
+    private BigDecimal lossWeight;
+
+    @TableField("loss_freight")
+    @ApiModelProperty("货损金额（分）")
+    private BigDecimal lossFreight;
+
+    @TableField("prepay_freight")
+    @ApiModelProperty("预付运费金额（分）")
+    private BigDecimal prepayFreight;
+
+    @TableField("prepay_freight_flag")
+    @ApiModelProperty("预付运费标示  0:未预付 1：已预付")
+    private Integer prepayFreightFlag;
+
+    @TableField("settlement_freight")
+    @ApiModelProperty("结算金额（分）")
+    private BigDecimal settlementFreight;
+
+    @TableField("invoice_type")
+    @ApiModelProperty("开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+
+    @TableField("status")
+    @ApiModelProperty("状态 0： 未同步， 1：已同步 2：回调成功 3：回调失败")
+    private Integer status;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

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

@@ -45,6 +45,7 @@ public class SettlementDriver implements HasKey<Integer> {
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private String settlementPlatform;              //结算平台
+    private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
     private String payErrorMsg;              //支付失败原因
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间

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

@@ -43,6 +43,7 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private BigDecimal lossWeight;                  //货损吨数
     private BigDecimal lossFreight;                 //货损金额（分）
     private BigDecimal prepayFreight;               //预付运费金额（分）
+    private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private Integer status;                         //状态

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -75,12 +75,14 @@ public interface OrderChildService {
     void orderChildExpect();
 
     /**
-     * 查询在途运单
+     * 查询是否存在未通过榜单审核的运单
      * @param orderNo
      * @return
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
+    List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo);
+
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
 
     void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);

performance-web/src/main/java/com/clx/performance/service/TransportSyncService.java

+package com.clx.performance.service;
+
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+
+public interface TransportSyncService {
+
+    ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
+    SettlementDriverDetail settlementDriverDetail
+    );
+}

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -16,6 +16,7 @@ import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OwnerInfoService;
@@ -82,6 +83,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     private final OwnerInfoService ownerInfoService;
 
 
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -96,10 +99,17 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
             //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-
+            //1网运单 2普通单
+            Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+            log.info("invoiceType={}", invoiceType);
             ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+            if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+            } else {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+            }
             thawAccountParam.setOrderNo(orderNo);
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
             log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
             ownerAccountService.ownerAccountThaw(thawAccountParam);
             this.ownerConfirmCancelProcess(orderNo);
@@ -121,6 +131,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             }
             orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
                     ids);
+            //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
+            //1网运单 2普通单
+            Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+            log.info("invoiceType={}", invoiceType);
+            ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+            if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+            } else {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+            }
+            thawAccountParam.setOrderNo(orderNo);
+            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+            ownerAccountService.ownerAccountThaw(thawAccountParam);
 
         } else {
             List<OrderChild> arriveSendChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
@@ -183,13 +207,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             }
 
         }
-        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        thawAccountParam.setOrderNo(orderNo);
-        thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
 
         Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode);
         if (!result.succeed()) {
@@ -343,13 +360,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         orderFeign.orderCancelReason(orderCancelReasonParam);
 
-        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        thawAccountParam.setOrderNo(orderNo);
-        thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
+        //TODO 注意判断普通单还是网运单 普通单类型 2  网运单 1
 
         log.info("执行货主订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
 
@@ -476,13 +487,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
         orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
         orderFeign.orderCancelReason(orderCancelReasonParam);
-
         //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        thawAccountParam.setOrderNo(orderNo);
-        thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
 
         log.info("执行订单状态更改");
         if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -162,6 +162,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     private UserService userService;
 
 
+    @Autowired
+    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 
@@ -1047,6 +1050,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
         orderChild.setConfirmTime(LocalDateTime.now());
+
         orderChildDao.updateDriverConfirm(orderChild);
 
         // 更新车辆状态
@@ -2035,6 +2039,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildDao.selectInTransitOrderChild(orderNo);
     }
 
+    @Override
+    public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
+        return orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
+    }
+
 
     /**
      * @return

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkCaseOutRecordServiceImpl.java

+package com.clx.performance.service.impl.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
+import com.clx.performance.param.pc.PageNetworkCaseOutRecordListParam;
+import com.clx.performance.service.settle.NetworkCaseOutRecordService;
+import com.clx.performance.vo.pc.NetworkCaseOutRecordVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Service
+@AllArgsConstructor
+@Slf4j
+public class NetworkCaseOutRecordServiceImpl  implements NetworkCaseOutRecordService {
+
+    private final NetworkCaseOutRecordDao networkCaseOutRecordDao;
+
+    @Override
+    public IPage<NetworkCaseOutRecordVO> networkCaseOutRecord(PageNetworkCaseOutRecordListParam param) {
+        return networkCaseOutRecordDao.networkCaseOutRecord(param);
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkDriverAccountServiceImpl.java

+package com.clx.performance.service.impl.settle;
+
+
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.component.IdGenerateSnowFlake;
+import com.clx.performance.dao.settle.NetworkDriverAccountDao;
+import com.clx.performance.model.settle.NetworkDriverAccount;
+import com.clx.performance.param.pc.PageNetworkAccountListParam;
+import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
+import com.clx.performance.service.settle.NetworkDriverAccountService;
+import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import com.clx.user.feign.PaymentServiceFeign;
+import com.clx.user.vo.feign.WalletResidueCardVO;
+import com.msl.common.base.Optional;
+import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-12-19
+ * Time 11:34
+ */
+@Service
+@AllArgsConstructor
+@Slf4j
+public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountService {
+
+    private final NetworkDriverAccountDao networkDriverAccountDao;
+
+    private final IdGenerateSnowFlake idGenerateSnowFlake;
+
+    private final PaymentServiceFeign paymentServiceFeign;
+
+    @Override
+    public IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param) {
+        return networkDriverAccountDao.networkAccountList(param);
+    }
+
+    @Override
+    public void createNetworkDriverAccount(NetworkDriverAccountParam param) {
+        Optional<NetworkDriverAccount> optional = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, param.getDriverUserNo());
+        if (optional.isPresent()) {
+            log.info("当前用户已经存在,相关参数:{}", JSONUtil.parse(param));
+            return;
+        }
+
+        String walletCode = idGenerateSnowFlake.nextIdToString(1L);
+        NetworkDriverAccount entity = NetworkDriverAccount.builder().driverUserNo(param.getDriverUserNo())
+                .mobile(param.getMobile())
+                .driverUserName(param.getDriverUserName())
+                .accountBalance(BigDecimal.ZERO)
+                .usableBalance(BigDecimal.ZERO)
+                .frozenBalance(BigDecimal.ZERO)
+                .createBy("系统")
+                .walletCode(walletCode).build();
+        networkDriverAccountDao.saveEntity(entity);
+    }
+
+    @Override
+    public WalletResidueCardVO account(Integer userCode) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Result<WalletResidueCardVO> result = paymentServiceFeign.getWallet(userCode);
+        WalletResidueCardVO data = result.getData();
+        NetworkDriverAccount account = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, loginUserInfo.getUserNo()).get();
+
+        data.setAssetSum(data.getAssetSum().add(account.getAccountBalance().movePointLeft(2)));
+        data.setFrozen(new BigDecimal(data.getFrozen()).add(account.getFrozenBalance().movePointLeft(2)).longValue());
+        data.setResidue(new BigDecimal(data.getResidue()).add(account.getUsableBalance().movePointLeft(2)).longValue());
+
+        return data;
+    }
+}