Merge branch 'v10.7_borrowing_and_repayment_20240118' of…

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

@@ -113,6 +113,13 @@ public enum PerformanceResultEnum implements ResultEnum {
     SLIDER_CHECK_FAIL(1911, "滑块验证错误"),
     ORDER_CHILD_SYNC_ERROR(1912, "承运同步网络货运异常"),
 
+    BORROWER_NAME_EXIST(1701, "数据重复，请核实后重新提交"),
+    BORROWER_CONFIG_BORROWER_ID_EXIST(1701, "数据重复，请核实后重新提交"),
+
+    NB_BANK_API_ERROR(1800, "宁波银行api调用失败"),
+    NB_BANK_NOTIFY_ERROR(1801, "宁波银行回调失败"),
+    NB_BANK_PAY_TYPE_ERROR(1802, "支付方式不支持"),
+
     ;
     private final int code;
     private final String msg;

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum TransportSyncTypeEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+        NO_PASS(1, "未通过风控异常"),
+        EXCEPTION(2, "同步异常"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        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.getMsg(), name)).findFirst();
+        }
+
+        public static Integer getCodeByName(String name) {
+            return getByName(name).map(TransportSyncTypeEnum.Type::getCode).orElse(3);
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/borrower/BorrowerConfigEnum.java

+package com.clx.performance.enums.borrower;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum BorrowerConfigEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        ENABLE(1, "启用"),
+        DISABLE(2, "禁用"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum DeleteStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/borrower/BorrowerEnum.java

+package com.clx.performance.enums.borrower;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum BorrowerEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        ENABLE(1, "启用"),
+        DISABLE(2, "禁用"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum DeleteStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/nbbank/NbBankRecordEnum.java

+package com.clx.performance.enums.nbbank;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum NbBankRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        DIRECT_BANK_TRANSFER_ORDER(1, "转账直连下单"),
+        UNION_PAY_DIRECT_ORDER(2, "银联订单支付收款模式"),
+        QUERY_ORDER(3, "交易结果查询"),
+        NOTIFY_MERCHANT(4, "异步通知交易结果"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Type::getMsg).orElse(null);
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildInvoiceStatusDTO.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 ThirdOrderChildInvoiceStatusDTO {
+
+    @ApiModelProperty(value = "开票状态：0未开票 1已开票 2运单不存在")
+    private Integer status;
+
+}

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildInvoiceStatusParam.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 ThirdOrderChildInvoiceStatusParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildRiskStatusDTO.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 ThirdOrderChildRiskStatusDTO {
+
+    @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/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;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
-@ToString
-@NoArgsConstructor
+@Builder
 public class ThirdOrderChildRiskStatusParam {
 
     @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
     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/pc/borrower/BorrowerAddParam.java

+package com.clx.performance.param.pc.borrower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BorrowerAddParam {
+
+    @ApiModelProperty(value = "借出方", example = "张三")
+    @NotBlank(message = "借出方不能为空")
+    private String name;
+    @ApiModelProperty(value = "所属银行", example = "工商银行")
+    @NotBlank(message = "所属银行不能为空")
+    private String bankName;
+    @ApiModelProperty(value = "银行账号", example = "10000000000000000")
+    @NotBlank(message = "不能为空")
+    private String bankCardNo;
+
+}

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

+package com.clx.performance.param.pc.borrower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BorrowerConfigAddParam {
+
+    @ApiModelProperty(value = "借出方id", example = "1")
+    private Integer borrowerId;
+    @ApiModelProperty(value = "类型：1资金 2虚拟货币", example = "1")
+    private Integer type;
+    @ApiModelProperty(value = "借款天数", example = "1")
+    private Integer day;
+
+}

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

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

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

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

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

+package com.clx.performance.param.pc.borrower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BorrowerConfigUpdateParam {
+
+    @ApiModelProperty(value = "id", example = "1")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+    @ApiModelProperty(value = "借出方id", example = "1")
+    private Integer borrowerId;
+    @ApiModelProperty(value = "类型：1资金 2虚拟货币", example = "1")
+    private Integer type;
+    @ApiModelProperty(value = "借款天数", example = "1")
+    private Integer day;
+
+}

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

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

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

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

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

+package com.clx.performance.param.pc.borrower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BorrowerUpdateParam {
+
+    @ApiModelProperty(value = "id", example = "1")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+    @ApiModelProperty(value = "借出方", example = "张三")
+    @NotBlank(message = "借出方不能为空")
+    private String name;
+    @ApiModelProperty(value = "所属银行", example = "工商银行")
+    @NotBlank(message = "所属银行不能为空")
+    private String bankName;
+    @ApiModelProperty(value = "银行账号", example = "10000000000000000")
+    @NotBlank(message = "银行账号不能为空")
+    private String bankCardNo;
+
+}

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

+package com.clx.performance.param.pc.borrower;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageBorrowerConfigParam extends PageParam {
+
+    @ApiModelProperty(value = "借出方", example = "张三")
+    private String borrowerName;
+
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "")
+    private Integer status;
+
+}
\ No newline at end of file

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

+package com.clx.performance.param.pc.borrower;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageBorrowerParam extends PageParam {
+
+    @ApiModelProperty(value = "借出方", example = "张三")
+    private String name;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.mq;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OrderTruckBindCancelParam {
+
+    //货单编号
+    private String orderGoodsNo;
+    //订单编号
+    private String orderNo;
+
+}

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

+package com.clx.performance.vo.pc.borrower;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 借款配置
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@ApiModel(description = "借款配置")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BorrowerConfigVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "借出方id", example = "")
+    private Integer borrowerId;
+    @ApiModelProperty(value = "借出方", example = "")
+    private String borrowerName;
+    @ApiModelProperty(value = "类型：1资金 2虚拟货币", example = "")
+    private Integer type;
+    @ApiModelProperty(value = "借款天数", example = "")
+    private Integer day;
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "")
+    private Integer status;
+    @ApiModelProperty(value = "操作人编码", example = "")
+    private Long opUserNo;
+    @ApiModelProperty(value = "操作人", example = "")
+    private String opUserName;
+    @ApiModelProperty(value = "操作时间", example = "")
+    private String opTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc.borrower;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 借出方
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@ApiModel(description = "借出方")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class BorrowerVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "借出方", example = "")
+    private String name;
+    @ApiModelProperty(value = "所属银行", example = "")
+    private String bankName;
+    @ApiModelProperty(value = "银行账号", example = "")
+    private String bankCardNo;
+    @ApiModelProperty(value = "状态：1启用 2禁用", example = "")
+    private Integer status;
+    @ApiModelProperty(value = "操作人编码", example = "")
+    private Long opUserNo;
+    @ApiModelProperty(value = "操作人", example = "")
+    private String opUserName;
+    @ApiModelProperty(value = "操作时间", example = "")
+    private String opTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+
+}
\ No newline at end of file

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

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

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

+package com.clx.performance.vo.pc.nbbank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+* @Author: aiqinguo
+* @Description: 订单支付
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class NbBankOrderPayResultVO {
+
+    @ApiModelProperty(value = "金额（分）", example = "")
+    private Integer amount;
+
+    @ApiModelProperty(value = "流水号", example = "20231129145541")
+    private String merSeqNo;
+    @ApiModelProperty(value = "第三方流水号", example = "20231129145541065503563czKTBzy")
+    private String transSeqNo;
+    @ApiModelProperty(value = "转账编号", example = "")
+    private String signNo;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc.nbbank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+* @Author: aiqinguo
+* @Description: 订单状态
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class NbBankOrderPayStatusResultVO {
+
+    @ApiModelProperty(value = "金额（分）", example = "")
+    private Integer amount;
+    @ApiModelProperty(value = "实收金额（分）", example = "")
+    private Integer realAmount;
+
+    @ApiModelProperty(value = "流水号", example = "20231129145541")
+    private String merSeqNo;
+    @ApiModelProperty(value = "第三方流水号", example = "20231129145541065503563czKTBzy")
+    private String transSeqNo;
+    @ApiModelProperty(value = "转账编号", example = "")
+    private String signNo;
+
+    @ApiModelProperty(value = "交易状态", example = "")
+    private Integer transStatus;
+
+}
\ No newline at end of file

performance-web/pom.xml

@@ -255,6 +255,12 @@
             <version>1.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.nbopen</groupId>
+            <artifactId>openBasicSDK</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+
     </dependencies>
 
 

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

+package com.clx.performance.component;
+
+
+import cn.hutool.json.JSONUtil;
+import com.clx.order.feign.OrderFeign;
+import com.clx.performance.enums.OwnerAccountEnum;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+@AllArgsConstructor
+public class OwnerAccountComponent {
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+    private final OwnerAccountService ownerAccountService;
+
+    private final SettlementOwnerService settlementOwnerService;
+
+    private final OrderFeign orderFeign;
+
+
+    public void thawOwnerAccountByOrderNo(String orderNo) {
+        Boolean flag = settlementOwnerDetailService.thawAndLockSettlement(orderNo);
+        if (flag) {
+            log.info("当前存在在途运单");
+            orderFeign.saveOrderSettlementJobRecord(orderNo);
+            return;
+        }
+        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
+        Integer invoiceType = settlementOwnerDetailService.getInvoiceType(orderNo);
+        //1 网运单 2 普通单
+        log.info("invoiceType={}", invoiceType);
+        ThawAccountParam thawAccountParam = new ThawAccountParam();
+        thawAccountParam.setOrderNo(orderNo);
+        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+            log.info("执行普通单解冻");
+            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+        } else {
+            log.info("执行网运单解冻");
+            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+        }
+        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+        ownerAccountService.ownerAccountThaw(thawAccountParam);
+
+        //通知结算单锁定
+        settlementOwnerService.updateStatusByOrderNo(orderNo, 1, 10, 20);
+    }
+}

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

@@ -115,4 +115,55 @@ public class RabbitBeanConfig {
     public Binding orderCancelExchangeBind() {
         return BindingBuilder.bind(orderCancelQueue()).to(orderCancelExchange()).with(RabbitKeyConstants.ORDER_CANCEL_ROUTE_KEY);
     }
+
+    /**
+     * 运单同步网络货运队列
+     * @return
+     */
+    @Bean
+    public Queue orderChildSyncTransportQueue() {
+        return new Queue(RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_QUEUE, true, false, false);
+    }
+
+    /**
+     * 运单同步网络货运交换机
+     **/
+    @Bean
+    public DirectExchange orderChildSyncTransportExchange() {
+        return new DirectExchange(RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE);
+    }
+
+    /**
+     * 运单同步网络货运绑定
+     */
+    @Bean
+    public Binding orderChildSyncTransportExchangeBind() {
+        return BindingBuilder.bind(orderChildSyncTransportQueue()).to(orderChildSyncTransportExchange()).with(RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY);
+    }
+
+    /**
+     * 处理延迟消息orderGoodsTruckBind
+     * @return
+     */
+    @Bean
+    public Queue orderGoodsTruckBindQueue() {
+        return new Queue(RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_QUEUE, true, false, false);
+    }
+
+    /**
+     * 处理延迟消息orderGoodsTruckBind
+     **/
+    @Bean
+    public CustomExchange orderGoodsTruckBindExchange() {
+        Map<String, Object> arguments = new HashMap<>();
+        //设置路由模式 direct模式
+        arguments.put("x-delayed-type", "direct");
+        return new CustomExchange(RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_EXCHANGE,"x-delayed-message", true, false, arguments);
+    }
+
+    //绑定交换机,队列和routingKey
+    @Bean
+    public Binding orderGoodsTruckBindBindingDelayedExchange(@Qualifier("orderGoodsTruckBindQueue")Queue queue,@Qualifier("orderGoodsTruckBindExchange")CustomExchange customExchange) {
+        return BindingBuilder.bind(queue).to(customExchange).with(RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_ROUTE_KEY).noargs();
+    }
 }

performance-web/src/main/java/com/clx/performance/config/nbbank/NbBankConfig.java

+package com.clx.performance.config.nbbank;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "nbbank")
+public class NbBankConfig {
+
+    private String appKey = "77667c76_3503_4c04_95f7_fc10938c7942";
+
+}

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

@@ -63,11 +63,24 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_LARGE_SCREEN_QUEUE ="clx-order.order.large.screen.queue";
 
+    public static final String ORDER_CHILD_SYNC_TRANSPORT_QUEUE ="clx-order.order.child.sync.transport.queue";
+
+    public static final String ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE ="clx-order.order.child.sync.transport.exchange";
+
+    public static final String ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY ="clx-order.order.child.sync.transport.route.key";
+
+    public static final String ORDER_THAW_SETTLEMENT_LAZY_EXCHANGE ="clx-order.thaw.settlement.lazy.exchange";
+
+    public static final String ORDER_THAW_SETTLEMENT_LAZY_ROUTE_KEY ="clx-order.thaw.settlement.lazy.route.key";
 
     // 预付运费和保证金 自动冻结 触发消息队列
     public static final String FREEZE_TRIGGER_EXCHANGE = "clx-order.freeze.trigger.exchange";
     public static final String FREEZE_TRIGGER_QUEUE = "clx-order.freeze.trigger.queue";
     public static final String FREEZE_TRIGGER_ROUTING_KEY = "clx-order.freeze.trigger.routing.key";
 
+    public static final String ORDER_TRUCK_BIND_LAZY_EXCHANGE ="clx-order.truck.bind.lazy.exchange";
+
+    public static final String ORDER_TRUCK_BIND_LAZY_QUEUE ="clx-order.truck.bind.lazy.queue";
 
+    public static final String ORDER_TRUCK_BIND_LAZY_ROUTE_KEY ="clx-order.truck.bind.lazy.route.key";
 }

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

@@ -2,7 +2,6 @@ package com.clx.performance.controller.feign;
 
 
 import com.clx.performance.param.pc.OrderCancelFeignParam;
-import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -26,14 +25,9 @@ public class OrderCancelFeignController {
 
     private final OrderCancelService orderCancelService;
 
-    @ApiOperation(value = "承运单发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "承运端发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
     public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
-//        OrderCancelParam cancelParam = new OrderCancelParam();
-//        cancelParam.setOrderNo(param.getOrderNo());
-//        cancelParam.setCancelType(3);
-//        cancelParam.setCreateByType(1);
-//        orderCancelService.platformCancelOrderPrePC(cancelParam);
         orderCancelService.ownerConfirmCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }

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

@@ -34,12 +34,12 @@ public class OrderCancelController {
     private final OrderCancelService orderCancelService;
 
 
-    @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
-    @PostMapping("/platformCancelOrderPre")
-    public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
-        orderCancelService.platformCancelOrderPre(param);
-        return Result.ok();
-    }
+//    @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
+//    @PostMapping("/platformCancelOrderPre")
+//    public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
+//        orderCancelService.platformCancelOrderPre(param);
+//        return Result.ok();
+//    }
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")

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

+package com.clx.performance.controller.pc.borrower.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.service.borrower.BorrowerConfigService;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/borrowerConfig")
+@Validated
+@Api(tags = "承运端-借出方借款配置")
+@AllArgsConstructor
+public class CarrierBorrowerConfigController {
+
+    private final BorrowerConfigService borrowerConfigService;
+
+
+    @ApiOperation(value = "新增借出方配置", notes = "<br>By:艾庆国")
+    @PostMapping("/saveBorrowerConfig")
+    @UnitCovert
+    public Result<Void> saveBorrowerConfig(@RequestBody @Validated BorrowerConfigAddParam param) {
+        borrowerConfigService.saveBorrowerConfig(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新借出方配置", notes = "<br>By:艾庆国")
+    @PostMapping("/updateBorrowerConfig")
+    public Result<Void> updateBorrowerConfig(@RequestBody @Validated BorrowerConfigUpdateParam param) {
+        borrowerConfigService.updateBorrowerConfig(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新借出方配置状态", notes = "<br>By:艾庆国")
+    @PostMapping("/updateStatus")
+    public Result<Void> updateStatus(@RequestBody @Validated BorrowerConfigStatusUpdateParam param) {
+        borrowerConfigService.updateStatus(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新删除借出方配置", notes = "<br>By:艾庆国")
+    @PostMapping("/updateDelete")
+    public Result<Void> updateDelete(@RequestBody @Validated BorrowerConfigDeleteUpdateParam param) {
+        borrowerConfigService.updateDelete(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页搜索借出方配置列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageBorrower")
+    public Result<PageData<BorrowerConfigVO>> pageBorrowerConfig(@RequestBody @Validated PageBorrowerConfigParam param) {
+        IPage<BorrowerConfigVO> page = borrowerConfigService.pageBorrowerConfig(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "查询所有借出方配置列表",notes = "<br>By:艾庆国")
+    @PostMapping("/ListBorrowerConfig")
+    public Result<List<BorrowerConfigVO>> ListBorrowerConfig() {
+        return Result.ok(borrowerConfigService.ListBorrowerConfig());
+    }
+
+}

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

+package com.clx.performance.controller.pc.borrower.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.service.borrower.BorrowerService;
+import com.clx.performance.service.impl.borrower.BorrowerServiceImpl;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/borrower")
+@Validated
+@Api(tags = "承运端-借出方配置")
+@AllArgsConstructor
+public class CarrierBorrowerController {
+
+    private final BorrowerService borrowerService;
+
+
+    @ApiOperation(value = "新增借出方", notes = "<br>By:艾庆国")
+    @PostMapping("/saveBorrower")
+    @UnitCovert
+    public Result<Void> saveBorrower(@RequestBody @Validated BorrowerAddParam param) {
+        borrowerService.saveBorrower(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新借出方", notes = "<br>By:艾庆国")
+    @PostMapping("/updateBorrower")
+    public Result<Void> updateBorrower(@RequestBody @Validated BorrowerUpdateParam param) {
+        borrowerService.updateBorrower(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新借出方状态", notes = "<br>By:艾庆国")
+    @PostMapping("/updateStatus")
+    public Result<Void> updateStatus(@RequestBody @Validated BorrowerStatusUpdateParam param) {
+        borrowerService.updateStatus(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "更新删除借出方", notes = "<br>By:艾庆国")
+    @PostMapping("/updateDelete")
+    public Result<Void> updateDelete(@RequestBody @Validated BorrowerDeleteUpdateParam param) {
+        borrowerService.updateDelete(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "分页搜索借出方列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageBorrower")
+    public Result<PageData<BorrowerVO>> pageBorrower(@RequestBody @Validated PageBorrowerParam param) {
+        IPage<BorrowerVO> page = borrowerService.pageBorrower(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+    @ApiOperation(value = "查询所有借出方列表",notes = "<br>By:艾庆国")
+    @PostMapping("/ListBorrower")
+    public Result<List<BorrowerVO>> ListBorrower() {
+        return Result.ok(borrowerService.ListBorrower());
+    }
+
+}

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

@@ -162,7 +162,7 @@ public class OwnerAccountController {
 
     @ApiOperation(value = "创建账户", notes = "<br>By:胡宇帆")
     @PostMapping("/createAccount")
-    public Result<Object> createAccount(CreteAccountParam param) {
+    public Result<Object> createAccount(@RequestBody CreteAccountParam param) {
         ownerAccountService.createAccount(param);
         return Result.ok();
     }

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

@@ -18,7 +18,7 @@ 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.param.feign.transport.ThirdOrderChildRiskStatusDTO;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
 import com.clx.performance.service.settle.SettlementOwnerService;
@@ -56,6 +56,9 @@ public class TransportSyncController {
 
     private final SettlementOwnerService settlementOwnerService;
 
+    private final OrderChildSyncTransportRecordService childSyncTransportRecordService;
+
+
     /**
      * 支付结果
      * @param param
@@ -103,11 +106,17 @@ public class TransportSyncController {
         log.info("riskStatusNotify 原始报文：{}", bean);
         String decrypt = ThirdComponent.decrypt(bean.getData());
         log.info("riskStatusNotify 解密后：{}", decrypt);
-        ThirdOrderChildRiskStatusParam invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, ThirdOrderChildRiskStatusParam.class);
+        ThirdOrderChildRiskStatusDTO invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, ThirdOrderChildRiskStatusDTO.class);
 
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }
-
+    @ApiOperation(value = "addOrderChildSyncTransportRecord", notes = "<br>By:胡宇帆")
+    @GetMapping("/addOrderChildSyncTransportRecord")
+    public Result<Object> syncTest(@RequestParam("id") Integer id) {
+        SettlementDriverDetail driverDetail = settlementDriverDetailDao.getEntityByKey(id).get();
+        childSyncTransportRecordService.addOrderChildSyncTransportRecord(driverDetail);
+        return Result.ok();
+    }
 
     @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
     @GetMapping("/syncTest")

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

+package com.clx.performance.controller.temp;
+
+import com.clx.performance.service.thirdparty.nbbank.NbBankService;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderPayStatusResultVO;
+import com.msl.common.result.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @Author: aiqingguo
+ * @Description: 临时接口
+ * @Date: 2023-8-21 12:10:16
+ * @Version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping(value="/temp/bank")
+public class TempBankController {
+
+    @Autowired
+    private NbBankService bankService;
+
+    @ApiOperation(value = "directBankTransferOrder", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/directBankTransferOrder", method = RequestMethod.POST)
+    public Result<NbBankOrderPayResultVO> directBankTransferOrder() throws Exception {
+
+        return Result.ok(bankService.orderPay(1));
+    }
+
+    @ApiOperation(value = "unionPayDirectOrder", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/unionPayDirectOrder", method = RequestMethod.POST)
+    public Result<NbBankOrderPayResultVO> unionPayDirectOrder() throws Exception {
+
+        return Result.ok(bankService.orderPay(2));
+    }
+
+    @ApiOperation(value = "queryOrder", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/queryOrderTest", method = RequestMethod.POST)
+    public Result<NbBankOrderPayStatusResultVO> queryOrderTest(String merSeqNo) throws Exception {
+
+        return Result.ok(bankService.getOrderStatus(merSeqNo));
+    }
+
+}

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

@@ -5,6 +5,7 @@ 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.param.feign.transport.ThirdOrderChildRiskStatusParam;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
@@ -109,4 +110,15 @@ public class TempController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "获取风控状态 (临时接口)", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/getRiskStatus", method = RequestMethod.POST)
+    public Result<Void> getRiskStatus(String childNo) {
+        ThirdOrderChildRiskStatusParam param = ThirdOrderChildRiskStatusParam.builder().build();
+        param.setChildNo(childNo);
+        HttpDTO httpDTO = transportFeignService.getRiskStatus(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("{}", decrypt);
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/controller/thirdparty/NbBankController.java

+package com.clx.performance.controller.thirdparty;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.service.thirdparty.nbbank.NbBankNotifyService;
+import com.nbopen.api.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/nbbank")
+@Api(tags = "宁波银行回调 (易付通)")
+public class NbBankController {
+
+    @Autowired
+    private NbBankNotifyService nbBankNotifyService;
+
+    @ApiOperation(value = "notify", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/notify", method = RequestMethod.POST)
+    public Object notify(@RequestBody Map<String, Object> body) throws Exception {
+
+        try {
+
+            nbBankNotifyService.payNotify(JSON.toJSONString(body));
+            return getResultSuc();
+        }catch (Exception e){
+            e.printStackTrace();
+            return getResultFail();
+        }
+    }
+
+    private Object getResultSuc() throws Exception {
+
+        Map<String, String> data = new HashMap<>();
+        data.put("errorCode", "000000");
+        data.put("errorMsg", "成功");
+
+        RequestApiData requestApiData = new RequestApiData();
+        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setData(data);
+        requestApiData.setServiceId("notifyMerchant");
+
+        RequestHead requestHead = new RequestHead();
+        requestHead.setRqsJrnlNo(NBOpenSDK.getRandom());
+
+        SDKRequest request = new SDKRequest();
+        request.setData(requestApiData);
+        request.setHead(requestHead);
+
+        log.info("加密前: "+ JSON.toJSONString(request));
+        SDKResponse result = NBOpenSDK.encryptMessage(request);
+        log.info("加密后: "+JSON.toJSONString(result));
+
+        return result.getData();
+    }
+
+    private Object getResultFail() throws Exception {
+
+        Map<String, String> data = new HashMap<>();
+        data.put("errorCode", "ER001");
+        data.put("errorMsg", "失败");
+
+        RequestApiData requestApiData = new RequestApiData();
+        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setData(data);
+        requestApiData.setServiceId("notifyMerchant");
+
+        RequestHead requestHead = new RequestHead();
+        requestHead.setRqsJrnlNo(NBOpenSDK.getRandom());
+
+        SDKRequest request = new SDKRequest();
+        request.setData(requestApiData);
+        request.setHead(requestHead);
+
+        log.info("加密前: "+ JSON.toJSONString(request));
+        SDKResponse result = NBOpenSDK.encryptMessage(request);
+        log.info("加密后: "+JSON.toJSONString(result));
+
+        return result.getData();
+    }
+
+}

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

+package com.clx.performance.dao;
+
+import com.msl.common.dao.BaseDao;
+import com.clx.performance.mapper.OrderChildSyncTransportInvoiceRecordMapper;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+
+import java.util.List;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+public interface OrderChildSyncTransportInvoiceRecordDao extends BaseDao<OrderChildSyncTransportInvoiceRecordMapper, OrderChildSyncTransportInvoiceRecord, Integer> {
+
+    List<OrderChildSyncTransportInvoiceRecord> selectListForJob();
+}

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

@@ -31,6 +31,8 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
 
+    void updateOrderGoodsBindStatus(List<String> orderGoodsList, Integer code);
+
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList);
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo);

performance-web/src/main/java/com/clx/performance/dao/borrower/BorrowerConfigDao.java

+package com.clx.performance.dao.borrower;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.borrower.BorrowerConfigMapper;
+import com.clx.performance.model.borrower.BorrowerConfig;
+import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借款配置
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface BorrowerConfigDao extends BaseDao<BorrowerConfigMapper, BorrowerConfig, Integer> {
+
+    boolean update(BorrowerConfig item);
+    boolean updateStatus(BorrowerConfig item);
+    boolean updateDelete(BorrowerConfig item);
+
+    Optional<BorrowerConfig> selectByBorrowerId(Integer borrowerId);
+
+    List<BorrowerConfig> listEnable();
+
+    IPage<BorrowerConfigVO> pageByParam(PageBorrowerConfigParam param);
+}

performance-web/src/main/java/com/clx/performance/dao/borrower/BorrowerDao.java

+package com.clx.performance.dao.borrower;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.borrower.BorrowerMapper;
+import com.clx.performance.model.borrower.Borrower;
+import com.clx.performance.param.pc.borrower.PageBorrowerParam;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface BorrowerDao extends BaseDao<BorrowerMapper, Borrower, Integer> {
+
+    boolean update(Borrower item);
+    boolean updateStatus(Borrower item);
+    boolean updateDelete(Borrower item);
+
+    Optional<Borrower> selectByName(String name);
+    List<Borrower> listEnable();
+
+    IPage<BorrowerVO> pageByParam(PageBorrowerParam param);
+
+}

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

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.enums.TransportSyncTypeEnum;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
+import com.clx.performance.mapper.OrderChildSyncTransportInvoiceRecordMapper;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+@Repository
+public class OrderChildSyncTransportInvoiceRecordDaoImpl extends BaseDaoImpl<OrderChildSyncTransportInvoiceRecordMapper, OrderChildSyncTransportInvoiceRecord, Integer> implements OrderChildSyncTransportInvoiceRecordDao {
+
+    @Override
+    public List<OrderChildSyncTransportInvoiceRecord> selectListForJob() {
+        return baseMapper.selectList(null);
+    }
+}

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

@@ -87,6 +87,15 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         );
     }
 
+    @Override
+    public void updateOrderGoodsBindStatus(List<String> orderGoodsList, Integer code) {
+        update(lUdWrapper()
+                .in(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsList)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
+                .set(OrderGoodsTruckBind::getStatus, code)
+        );
+    }
+
     @Override
     public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList) {
         update(lUdWrapper()

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

+package com.clx.performance.dao.impl.borrower;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.borrower.BorrowerConfigDao;
+import com.clx.performance.enums.borrower.BorrowerConfigEnum;
+import com.clx.performance.enums.borrower.BorrowerEnum;
+import com.clx.performance.mapper.borrower.BorrowerConfigMapper;
+import com.clx.performance.model.borrower.Borrower;
+import com.clx.performance.model.borrower.BorrowerConfig;
+import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借款配置
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+@Repository
+public class BorrowerConfigDaoImpl extends BaseDaoImpl<BorrowerConfigMapper, BorrowerConfig, Integer> implements BorrowerConfigDao {
+
+
+    @Override
+    public boolean update(BorrowerConfig item) {
+        return update(lUdWrapper()
+                .eq(BorrowerConfig::getId, item.getId())
+                .set(BorrowerConfig::getBorrowerId, item.getBorrowerId())
+                .set(BorrowerConfig::getBorrowerName, item.getBorrowerName())
+                .set(BorrowerConfig::getType, item.getType())
+                .set(BorrowerConfig::getDay, item.getDay())
+
+                .set(BorrowerConfig::getOpUserNo, item.getOpUserNo())
+                .set(BorrowerConfig::getOpUserName, item.getOpUserName())
+                .set(BorrowerConfig::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public boolean updateStatus(BorrowerConfig item) {
+        return update(lUdWrapper()
+                .eq(BorrowerConfig::getId, item.getId())
+                .set(BorrowerConfig::getStatus, item.getStatus())
+
+                .set(BorrowerConfig::getOpUserNo, item.getOpUserNo())
+                .set(BorrowerConfig::getOpUserName, item.getOpUserName())
+                .set(BorrowerConfig::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public boolean updateDelete(BorrowerConfig item) {
+        return update(lUdWrapper()
+                .eq(BorrowerConfig::getId, item.getId())
+                .set(BorrowerConfig::getDeleteStatus, item.getDeleteStatus())
+
+                .set(BorrowerConfig::getOpUserNo, item.getOpUserNo())
+                .set(BorrowerConfig::getOpUserName, item.getOpUserName())
+                .set(BorrowerConfig::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public Optional<BorrowerConfig> selectByBorrowerId(Integer borrowerId) {
+        return Optional.of(borrowerId)
+                .map(item -> lQrWrapper()
+                        .eq(BorrowerConfig::getBorrowerId, item)
+                        .eq(BorrowerConfig::getDeleteStatus, BorrowerConfigEnum.DeleteStatus.NO.getCode())
+                        .last("limit 1")
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public List<BorrowerConfig> listEnable() {
+        return list(lQrWrapper()
+                .eq(BorrowerConfig::getDeleteStatus, BorrowerConfigEnum.DeleteStatus.NO.getCode())
+                .eq(BorrowerConfig::getStatus, BorrowerConfigEnum.Status.ENABLE.getCode())
+        );
+    }
+
+    @Override
+    public IPage<BorrowerConfigVO> pageByParam(PageBorrowerConfigParam param) {
+        Page<BorrowerConfigVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageByParam(page,param);
+    }
+}

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

+package com.clx.performance.dao.impl.borrower;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.borrower.BorrowerDao;
+import com.clx.performance.enums.borrower.BorrowerEnum;
+import com.clx.performance.mapper.borrower.BorrowerMapper;
+import com.clx.performance.model.borrower.Borrower;
+import com.clx.performance.param.pc.borrower.PageBorrowerParam;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+@Repository
+public class BorrowerDaoImpl extends BaseDaoImpl<BorrowerMapper, Borrower, Integer> implements BorrowerDao {
+
+
+    @Override
+    public boolean update(Borrower item) {
+        return update(lUdWrapper()
+                .eq(Borrower::getId, item.getId())
+                .set(Borrower::getName, item.getName())
+                .set(Borrower::getBankName, item.getBankName())
+                .set(Borrower::getBankCardNo, item.getBankCardNo())
+
+                .set(Borrower::getOpUserNo, item.getOpUserNo())
+                .set(Borrower::getOpUserName, item.getOpUserName())
+                .set(Borrower::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public boolean updateStatus(Borrower item) {
+        return update(lUdWrapper()
+                .eq(Borrower::getId, item.getId())
+                .set(Borrower::getStatus, item.getStatus())
+
+                .set(Borrower::getOpUserNo, item.getOpUserNo())
+                .set(Borrower::getOpUserName, item.getOpUserName())
+                .set(Borrower::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public boolean updateDelete(Borrower item) {
+        return update(lUdWrapper()
+                .eq(Borrower::getId, item.getId())
+                .set(Borrower::getDeleteStatus, item.getDeleteStatus())
+
+                .set(Borrower::getOpUserNo, item.getOpUserNo())
+                .set(Borrower::getOpUserName, item.getOpUserName())
+                .set(Borrower::getOpTime, item.getOpTime())
+        );
+    }
+
+    @Override
+    public Optional<Borrower> selectByName(String name) {
+        return Optional.of(name)
+                .map(item -> lQrWrapper()
+                        .eq(Borrower::getName, item)
+                        .eq(Borrower::getDeleteStatus, BorrowerEnum.DeleteStatus.NO.getCode())
+                        .last("limit 1")
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public List<Borrower> listEnable() {
+        return list(lQrWrapper()
+                .eq(Borrower::getDeleteStatus, BorrowerEnum.DeleteStatus.NO.getCode())
+                .eq(Borrower::getStatus, BorrowerEnum.Status.ENABLE.getCode())
+        );
+    }
+
+    @Override
+    public IPage<BorrowerVO> pageByParam(PageBorrowerParam param) {
+        Page<BorrowerVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageByParam(page,param);
+
+    }
+
+}

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

+package com.clx.performance.dao.impl.nbbank;
+
+
+import com.clx.performance.dao.nbbank.NbBankRecordDao;
+import com.clx.performance.mapper.nbbank.NbBankRecordMapper;
+import com.clx.performance.model.nbbank.NbBankRecord;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+@Repository
+public class NbBankRecordRecordDaoImpl extends BaseDaoImpl<NbBankRecordMapper, NbBankRecord, Integer> implements NbBankRecordDao {
+
+
+
+}

performance-web/src/main/java/com/clx/performance/dao/nbbank/NbBankRecordDao.java

+package com.clx.performance.dao.nbbank;
+
+
+import com.clx.performance.mapper.nbbank.NbBankRecordMapper;
+import com.clx.performance.model.nbbank.NbBankRecord;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface NbBankRecordDao extends BaseDao<NbBankRecordMapper, NbBankRecord, Integer> {
+
+
+}

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

+package com.clx.performance.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class OrderCancelResult {
+
+    private Integer orderStatusCode;
+
+    private List<String> childNoList;
+}

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

+package com.clx.performance.dto;
+
+import com.clx.order.param.feign.RollbackOrderWeightParam;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.pc.OrderGoodsCancelParam;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class OrderGoodsCancelDTO {
+
+    private OrderGoodsCancelParam orderGoodsCancelParam;
+
+    private Integer orderGoodsStatus;
+
+    private OrderGoods orderGoods;
+
+    private List<String> childNoList;
+
+}

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

@@ -10,8 +10,6 @@ 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 {
@@ -25,10 +23,10 @@ public interface TransportFeignService {
     /**
      * 获取风控状态
      * @return
-     * @see com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam
+     * @see ThirdOrderChildRiskStatusDTO
      */
     @RequestMapping(value = "/transport-service/thirdParty/order/getRiskStatus", method = RequestMethod.POST)
-    HttpDTO getRiskStatus(@RequestBody @NotBlank(message = "运单编号不能为空") String childNo);
+    HttpDTO getRiskStatus(@RequestBody ThirdOrderChildRiskStatusParam param);
 
     /**
      * 运单支付运费同步
@@ -38,10 +36,11 @@ public interface TransportFeignService {
 
     /**
      * 获取运单开票状态
-     * @return 0-未申请，10-已申请，20-审核失败，30-已开票
+     * @return
+     * @see ThirdOrderChildInvoiceStatusDTO
      */
     @RequestMapping(value = "/transport-service/thirdParty/order/getInvoiceStatus", method = RequestMethod.POST)
-    Result<Integer> getInvoiceStatus(@RequestBody @NotBlank(message = "运单编号不能为空") String childNo);
+    HttpDTO getInvoiceStatus(@RequestBody ThirdOrderChildInvoiceStatusParam param);
 
     /**
      * 货主结算单同步 (只推同一货主)

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

+package com.clx.performance.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dto.OrderChildSyncDTO;
+import com.clx.performance.dto.OrderChildSyncResultDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.TransportSyncTypeEnum;
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.listener.OrderChildSyncTransportListener;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam;
+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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.LinkedList;
+import java.util.List;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class OrderChildSyncTransportInvoiceExceptionJob {
+
+    private final OrderChildSyncTransportInvoiceRecordDao orderChildSyncTransportInvoiceRecordDao;
+
+    private final OrderChildSyncTransportListener orderChildPaySync;
+
+    private final OrderChildDao orderChildDao;
+
+    private final TransportFeignService transportFeignService;
+
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
+    /**
+     * 同步网络货运
+     */
+    @XxlJob("orderChildSyncTransportInvoiceExceptionJob")
+    @Transactional(rollbackFor = Exception.class)
+    public void orderChildSyncTransportInvoiceExceptionJob() {
+        //只查询同步异常的网络货运任务
+        List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao.selectListForJob();
+        if (CollectionUtil.isEmpty(recordList)) {
+            return;
+        }
+        List<Integer> ids = new LinkedList<>();
+
+        for (OrderChildSyncTransportInvoiceRecord record : recordList) {
+            log.info("orderChildSyncTransportInvoiceExceptionJob执行：{}", JSONUtil.parse(record));
+            String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData();
+            String decrypt = ThirdComponent.decrypt(data);
+            Result result = JSONUtil.toBean(decrypt, Result.class);
+            if (result.succeed()) {
+                SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+                JSON json = JSONUtil.parse(result.getData());
+                Object status = json.getByPath("status");
+                ids.add(record.getId());
+                OrderChildSyncDTO bean = new OrderChildSyncDTO();
+                bean.setCode(0);
+                OrderChildSyncResultDTO dto = new OrderChildSyncResultDTO();
+                OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get();
+                log.info("查询网络货运结果数据：{}", JSONUtil.parse(result));
+                if (ObjectUtil.equal(status, 1)) {
+                    dto.setStatus(1);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ONLINE.getCode(), settlementDriverDetail);
+                } else if (ObjectUtil.equal(status, 0)){
+                    dto.setStatus(2);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
+
+                }else if (ObjectUtil.equal(status, 2)){
+//                    orderChildPaySync.transportOrderChildProcess(orderChild);
+                    dto.setStatus(2);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
+                } else {
+                    Object riskReason = json.getByPath("riskReason");
+                    OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
+                    entity.setChildNo(json.getByPath("childNo").toString());
+                    entity.setType(TransportSyncTypeEnum.Type.NO_PASS.getCode());
+                    entity.setRemark(riskReason == null ? "" : riskReason.toString());
+                    orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
+                }
+            }
+        }
+
+        orderChildSyncTransportInvoiceRecordDao.deleteByKeys(ids);
+    }
+}

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverBindListener.java

+package com.clx.performance.listener;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.order.enums.VehicleUsageEnum;
+import com.clx.performance.constant.RabbitKeyConstants;
+import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.vo.mq.OrderTruckBindCancelParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+@AllArgsConstructor
+public class OrderGoodsDriverBindListener {
+
+
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
+    @RabbitListener(queues = RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_QUEUE)
+    @Transactional(rollbackFor = Exception.class)
+    public void onMessage(String message) throws Exception {
+        OrderTruckBindCancelParam param = JSONUtil.toBean(message, OrderTruckBindCancelParam.class);
+        log.info("OrderGoodsDriverBindListener请求参数{}", JSONUtil.parse(param));
+        if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
+            String orderGoodsNo = param.getOrderGoodsNo();
+            OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).get();
+            if (VehicleUsageEnum.Status.OWN.getCode().equals(orderGoods.getVehicleUsage())) {
+                orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+            }
+        } else if (StringUtils.isNotBlank(param.getOrderNo())) {
+            List<OrderGoods> orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(param.getOrderNo());
+            List<String> orderGoodsNoList = orderGoodsList.stream().filter(i -> VehicleUsageEnum.Status.OWN.getCode().equals(i.getVehicleUsage()))
+                    .map(OrderGoods::getOrderGoodsNo).collect(Collectors.toList());
+            if (CollectionUtil.isEmpty(orderGoodsNoList)) {
+                return;
+            }
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNoList, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        }
+    }
+}

performance-web/src/main/java/com/clx/performance/mapper/OrderChildSyncTransportInvoiceRecordMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+public interface OrderChildSyncTransportInvoiceRecordMapper extends BaseMapper<OrderChildSyncTransportInvoiceRecord> {
+}

performance-web/src/main/java/com/clx/performance/mapper/borrower/BorrowerConfigMapper.java

+package com.clx.performance.mapper.borrower;
+
+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.borrower.BorrowerConfig;
+import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
+import com.clx.performance.sqlProvider.borrower.BorrowerConfigSqlProvider;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+/**
+* @Author: aiqinguo
+* @Description: 借款配置
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Mapper
+public interface BorrowerConfigMapper extends BaseMapper<BorrowerConfig> {
+
+    /**
+     * @see BorrowerConfigSqlProvider#pageByParam(Page, PageBorrowerConfigParam)
+     */
+    @SelectProvider(type = BorrowerConfigSqlProvider.class, method = "pageByParam")
+    IPage<BorrowerConfigVO> pageByParam(@Param("page") Page<BorrowerConfigVO> page, @Param("param") PageBorrowerConfigParam param);
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/borrower/BorrowerMapper.java

+package com.clx.performance.mapper.borrower;
+
+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.borrower.Borrower;
+import com.clx.performance.param.pc.borrower.PageBorrowerParam;
+import com.clx.performance.sqlProvider.borrower.BorrowerSqlProvider;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+/**
+* @Author: aiqinguo
+* @Description: 借出方
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Mapper
+public interface BorrowerMapper extends BaseMapper<Borrower> {
+
+    /**
+     * @see BorrowerSqlProvider#pageByParam(Page, PageBorrowerParam)
+     */
+    @SelectProvider(type = BorrowerSqlProvider.class, method = "pageByParam")
+    IPage<BorrowerVO> pageByParam(@Param("page") Page<BorrowerVO> page, @Param("param") PageBorrowerParam param);
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/nbbank/NbBankRecordMapper.java

+package com.clx.performance.mapper.nbbank;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.nbbank.NbBankRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Author: aiqinguo
+* @Description: 宁波银行请求记录
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Mapper
+public interface NbBankRecordMapper extends BaseMapper<NbBankRecord> {
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OrderChildSyncTransportInvoiceRecord.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_child_sync_transport_invoice_record")
+public class OrderChildSyncTransportInvoiceRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("remark")
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @TableField("type")
+    @ApiModelProperty("备注 1: 未风控 2: 同步异常")
+    private Integer type;
+
+    @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/borrower/Borrower.java

+package com.clx.performance.model.borrower;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 借出方
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class Borrower implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private String name;                            //借出方
+    private String bankName;                        //所属银行
+    private String bankCardNo;                      //银行账号
+    private Integer deleteStatus;                   //删除状态: 0-否;1-是
+    private Integer status;                         //状态：1启用 2禁用
+    private Long opUserNo;                          //操作人编码
+    private String opUserName;                      //操作人
+    private LocalDateTime opTime;                   //操作时间
+    private LocalDateTime createTime;               //创建时间
+    private LocalDateTime modifiedTime;             //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/borrower/BorrowerConfig.java

+package com.clx.performance.model.borrower;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 借款配置
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class BorrowerConfig implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private Integer borrowerId;                     //借出方id
+    private String borrowerName;                    //借出方
+    private Integer type;                           //类型：1资金 2虚拟货币
+    private Integer day;                            //借款天数
+    private Integer deleteStatus;                   //删除状态: 0-否;1-是
+    private Integer status;                         //状态：1启用 2禁用
+    private Long opUserNo;                          //操作人编码
+    private String opUserName;                      //操作人
+    private LocalDateTime opTime;                   //操作时间
+    private LocalDateTime createTime;               //创建时间
+    private LocalDateTime modifiedTime;             //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/nbbank/NbBankRecord.java

+package com.clx.performance.model.nbbank;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 宁波银行请求记录
+* @Date: 2024/01/20 13:28:28
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class NbBankRecord implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private Integer type;                           //类型：1转账直连下单 2银联订单支付收款模式 3交易结果查询 4异步通知交易结果
+    private String merId;                           //商户号
+    private String merSeqNo;                        //流水号
+    private String transSeqNo;                      //第三方流水号
+    private Integer amount;                         //金额 （分）
+    private String param;                           //参数
+    private String result;                          //方法
+    private String errorCode;                       //错误码
+    private String errorMsg;                        //错误信息
+    private String transStatus;                     //交易状态
+    private LocalDateTime createTime;               //创建时间
+    private LocalDateTime modifiedTime;             //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+
+}
\ No newline at end of file

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

@@ -28,10 +28,10 @@ public interface OrderCancelService {
      * 平台取消订单前置(只修改订单状态)
      * @param param
      */
-    void platformCancelOrderPre(OrderCancelParam param);
+//    void platformCancelOrderPre(OrderCancelParam param);
 
     /**
-     * 修改订单状态后执行规划吨数
+     * 修改订单状态后执行归还吨数
      * @param param
      */
     void orderCancelProcess(OrderCancelParam param);

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

+package com.clx.performance.service;
+
+import com.msl.common.service.BaseService;
+import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+public interface OrderChildSyncTransportInvoiceRecordService {
+}

performance-web/src/main/java/com/clx/performance/service/borrower/BorrowerConfigService.java

+package com.clx.performance.service.borrower;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface BorrowerConfigService {
+
+    void saveBorrowerConfig(BorrowerConfigAddParam param);
+    void updateBorrowerConfig(BorrowerConfigUpdateParam param);
+    void updateStatus(BorrowerConfigStatusUpdateParam param);
+    void updateDelete(BorrowerConfigDeleteUpdateParam param);
+
+    IPage<BorrowerConfigVO> pageBorrowerConfig(PageBorrowerConfigParam param);
+    List<BorrowerConfigVO> ListBorrowerConfig();
+
+}

performance-web/src/main/java/com/clx/performance/service/borrower/BorrowerService.java

+package com.clx.performance.service.borrower;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+
+import java.util.List;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface BorrowerService {
+
+    void saveBorrower(BorrowerAddParam param);
+    void updateBorrower(BorrowerUpdateParam param);
+    void updateStatus(BorrowerStatusUpdateParam param);
+    void updateDelete(BorrowerDeleteUpdateParam param);
+
+    IPage<BorrowerVO> pageBorrower(PageBorrowerParam param);
+    List<BorrowerVO> ListBorrower();
+
+}

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

+package com.clx.performance.service.impl;
+
+import com.clx.performance.service.OrderChildSyncTransportInvoiceRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kavin
+ * Date 2024-01-03
+ * Time 10:17
+ */
+@Service
+public class OrderChildSyncTransportInvoiceRecordServiceImpl implements OrderChildSyncTransportInvoiceRecordService {
+}

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

@@ -1213,7 +1213,4 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         }
     }
 
-    public static void main(String[] args) {
-
-    }
 }

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

+package com.clx.performance.service.impl.borrower;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.borrower.BorrowerConfigDao;
+import com.clx.performance.dao.borrower.BorrowerDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.borrower.BorrowerConfigEnum;
+import com.clx.performance.model.borrower.Borrower;
+import com.clx.performance.model.borrower.BorrowerConfig;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.service.borrower.BorrowerConfigService;
+import com.clx.performance.struct.borrower.BorrowerConfigStruct;
+import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
+import com.msl.common.base.Optional;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+@Slf4j
+@Service
+public class BorrowerConfigServiceImpl implements BorrowerConfigService {
+
+    @Autowired
+    private BorrowerDao borrowerDao;
+
+    @Autowired
+    private BorrowerConfigDao borrowerConfigDao;
+
+    @Autowired
+    private BorrowerConfigStruct borrowerConfigStruct;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBorrowerConfig(BorrowerConfigAddParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        // 重复验证
+        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerId(param.getBorrowerId());
+        if (borrowerConfigOptional.isPresent()) {
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_BORROWER_ID_EXIST);
+        }
+
+        Borrower borrower = borrowerDao.getEntityByKey(param.getBorrowerId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        BorrowerConfig borrowerConfig = new BorrowerConfig();
+        borrowerConfig.setBorrowerId(borrower.getId());
+        borrowerConfig.setBorrowerName(borrower.getName());
+        borrowerConfig.setType(param.getType());
+        borrowerConfig.setDay(param.getDay());
+
+        borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());
+        borrowerConfig.setOpUserName(loginUserInfo.getUserName());
+        borrowerConfig.setOpTime(LocalDateTime.now());
+
+        borrowerConfigDao.saveEntity(borrowerConfig);
+    }
+
+    @Override
+    public void updateBorrowerConfig(BorrowerConfigUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        BorrowerConfig borrowerConfig = borrowerConfigDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        // 重复验证
+        Optional<BorrowerConfig> borrowerConfigOptional = borrowerConfigDao.selectByBorrowerId(param.getBorrowerId());
+        if (borrowerConfigOptional.isPresent() && !Objects.equals(borrowerConfig.getId(), borrowerConfigOptional.get().getId())) {
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_BORROWER_ID_EXIST);
+        }
+
+        Borrower borrower = borrowerDao.getEntityByKey(param.getBorrowerId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        borrowerConfig.setBorrowerId(borrower.getId());
+        borrowerConfig.setBorrowerName(borrower.getName());
+        borrowerConfig.setType(param.getType());
+        borrowerConfig.setDay(param.getDay());
+
+        borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());
+        borrowerConfig.setOpUserName(loginUserInfo.getUserName());
+        borrowerConfig.setOpTime(LocalDateTime.now());
+
+        borrowerConfigDao.update(borrowerConfig);
+    }
+
+    @Override
+    public void updateStatus(BorrowerConfigStatusUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        BorrowerConfig borrowerConfig = borrowerConfigDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        borrowerConfig.setStatus(param.getStatus());
+        borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());
+        borrowerConfig.setOpUserName(loginUserInfo.getUserName());
+        borrowerConfig.setOpTime(LocalDateTime.now());
+        borrowerConfigDao.updateStatus(borrowerConfig);
+    }
+
+    @Override
+    public void updateDelete(BorrowerConfigDeleteUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        BorrowerConfig borrowerConfig = borrowerConfigDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        borrowerConfig.setDeleteStatus(BorrowerConfigEnum.DeleteStatus.YES.getCode());
+        borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());
+        borrowerConfig.setOpUserName(loginUserInfo.getUserName());
+        borrowerConfig.setOpTime(LocalDateTime.now());
+        borrowerConfigDao.updateDelete(borrowerConfig);
+    }
+
+    @Override
+    public IPage<BorrowerConfigVO> pageBorrowerConfig(PageBorrowerConfigParam param) {
+        return borrowerConfigDao.pageByParam(param);
+
+    }
+
+    @Override
+    public List<BorrowerConfigVO> ListBorrowerConfig() {
+        return borrowerConfigStruct.convert(borrowerConfigDao.listEnable());
+    }
+
+}

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

+package com.clx.performance.service.impl.borrower;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.borrower.BorrowerDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.borrower.BorrowerEnum;
+import com.clx.performance.model.borrower.Borrower;
+import com.clx.performance.param.pc.borrower.*;
+import com.clx.performance.service.borrower.BorrowerService;
+import com.clx.performance.struct.borrower.BorrowerStruct;
+import com.clx.performance.vo.pc.borrower.BorrowerVO;
+import com.msl.common.base.Optional;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 借出方
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+@Slf4j
+@Service
+public class BorrowerServiceImpl implements BorrowerService {
+
+    @Autowired
+    private BorrowerDao borrowerDao;
+
+    @Autowired
+    private BorrowerStruct borrowerStruct;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBorrower(BorrowerAddParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        // 重复验证
+        Optional<Borrower> borrowerOptional = borrowerDao.selectByName(param.getName());
+        if (borrowerOptional.isPresent()) {
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_NAME_EXIST);
+        }
+
+        Borrower borrower = new Borrower();
+        borrower.setName(param.getName());
+        borrower.setBankName(param.getBankName());
+        borrower.setBankCardNo(param.getBankCardNo());
+
+        borrower.setOpUserNo(loginUserInfo.getUserNo());
+        borrower.setOpUserName(loginUserInfo.getUserName());
+        borrower.setOpTime(LocalDateTime.now());
+
+        borrowerDao.saveEntity(borrower);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateBorrower(BorrowerUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Borrower borrower = borrowerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        Optional<Borrower> borrowerOptional = borrowerDao.selectByName(param.getName());
+        if (borrowerOptional.isPresent() && !Objects.equals(borrower.getId(), borrowerOptional.get().getId())) {
+            throw new ServiceSystemException(PerformanceResultEnum.BORROWER_NAME_EXIST);
+        }
+
+        borrower.setName(param.getName());
+        borrower.setBankName(param.getBankName());
+        borrower.setBankCardNo(param.getBankCardNo());
+
+        borrower.setOpUserNo(loginUserInfo.getUserNo());
+        borrower.setOpUserName(loginUserInfo.getUserName());
+        borrower.setOpTime(LocalDateTime.now());
+
+        borrowerDao.update(borrower);
+    }
+
+    @Override
+    public void updateStatus(BorrowerStatusUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Borrower borrower = borrowerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        borrower.setStatus(param.getStatus());
+        borrower.setOpUserNo(loginUserInfo.getUserNo());
+        borrower.setOpUserName(loginUserInfo.getUserName());
+        borrower.setOpTime(LocalDateTime.now());
+        borrowerDao.updateStatus(borrower);
+    }
+
+    @Override
+    public void updateDelete(BorrowerDeleteUpdateParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Borrower borrower = borrowerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        borrower.setDeleteStatus(BorrowerEnum.DeleteStatus.YES.getCode());
+        borrower.setOpUserNo(loginUserInfo.getUserNo());
+        borrower.setOpUserName(loginUserInfo.getUserName());
+        borrower.setOpTime(LocalDateTime.now());
+        borrowerDao.updateDelete(borrower);
+    }
+
+    @Override
+    public IPage<BorrowerVO> pageBorrower(PageBorrowerParam param) {
+        return borrowerDao.pageByParam(param);
+
+    }
+
+    @Override
+    public List<BorrowerVO> ListBorrower() {
+        return borrowerStruct.convert(borrowerDao.listEnable());
+    }
+
+}

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

 package com.clx.performance.service.impl.settle;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.component.IdGenerateSnowFlake;
@@ -217,7 +218,24 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
     public IPage<APPNetworkDriverRunningWaterRecordVO> runningWaterList(NetworkDriverPageParam param) {
         Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
         param.setUserNo(userNo);
-        return networkDriverRunningWaterRecordDao.runningWaterList(param);
+        IPage<APPNetworkDriverRunningWaterRecordVO> page = networkDriverRunningWaterRecordDao.runningWaterList(param);
+        if (NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode().equals(param.getFundType())) {
+            if (CollectionUtil.isNotEmpty(page.getRecords())) {
+                for (APPNetworkDriverRunningWaterRecordVO record : page.getRecords()) {
+                    record.setAlterationBalance(record.getAlterationBalance().negate());
+                }
+            }
+        } else if (param.getFundType() == null ) {
+            if (CollectionUtil.isNotEmpty(page.getRecords())) {
+                for (APPNetworkDriverRunningWaterRecordVO record : page.getRecords()) {
+                    if (NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode().equals( record.getRunningWaterType())){
+                        record.setAlterationBalance(record.getAlterationBalance().negate());
+                    }
+                }
+            }
+        }
+
+        return page;
     }
 
     @Override

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

@@ -131,7 +131,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
         }
         else {
-            log.info("月结初始化货主结算单");
+            log.info("拉运完成结初始化货主结算单");
 
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(), settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 拉运完成初始化

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankNotifyServiceImpl.java

+package com.clx.performance.service.impl.thirdparty.nbbank;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.nbbank.NbBankRecordEnum;
+import com.clx.performance.service.thirdparty.nbbank.NbBankNotifyService;
+import com.clx.performance.service.thirdparty.nbbank.NbBankService;
+import com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService;
+import com.msl.common.exception.ServiceSystemException;
+import com.nbopen.api.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+@Slf4j
+@Service
+public class NbBankNotifyServiceImpl implements NbBankNotifyService {
+
+    @Autowired
+    private NbBankService bankService;
+
+    @Autowired
+    private NbBankThirdpartyService nbBankThirdpartyService;
+
+    /**
+     * 支付回调
+     * 6.2异步通知交易结果
+     * 解密后
+     * {
+     *     "data": {
+     *         "clearDate": "20231205",
+     *         "merId": "EFT33021200556315",
+     *         "merSeqNo": "20231205165038",
+     *         "payMethod": "L",
+     *         "pyerInfList": [
+     *             {
+     *                 "coreSeqNo": "",
+     *                 "customerId": "",
+     *                 "pyerAcctBankName": "",
+     *                 "pyerAcctBankNo": "",
+     *                 "pyerAcctName": "黑玫瑰",
+     *                 "pyerAcctNo": "86041110000076809",
+     *                 "signNo": "00",
+     *                 "transAmt": "0.01",
+     *                 "transDtTm": "2023-12-05 16:54:22"
+     *             }
+     *         ],
+     *         "realTrxAmt": "0.01",
+     *         "transDate": "20231205",
+     *         "transSeqNo": "2023120516503906838128gg6DOzjP",
+     *         "transStatus": "00",
+     *         "trxAmt": "0.01"
+     *     },
+     *     "head": {
+     *         "rqsJrnlNo": "16071726224843844",
+     *         "rspCode": "000000",
+     *         "rspDate": "2023-12-05",
+     *         "rspMsg": "处理成功",
+     *         "rspTime": "17:13:43:943"
+     *     }
+     * }
+     */
+    @Override
+    public void payNotify(String body) {
+        log.info("宁波银行回调, data:{}", JSON.toJSONString(body));
+
+        try {
+            RequestApiData requestApiData = new RequestApiData();
+            requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+            requestApiData.setData(JSON.parseObject(body));
+            requestApiData.setServiceId("notifyMerchant");
+
+            RequestHead requestHead = new RequestHead();
+            requestHead.setRqsJrnlNo(NBOpenSDK.getRandom());
+
+            SDKRequest request = new SDKRequest();
+            request.setData(requestApiData);
+            request.setHead(requestHead);
+            log.info("宁波银行, 回调:{}", JSON.toJSONString(request));
+            SDKResponse response = NBOpenSDK.decryptMessage(request);
+            log.info("宁波银行, 回调解密:{}", JSON.toJSONString(response));
+
+            JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
+            JSONObject data = responseJson.getJSONObject("data");
+
+            nbBankThirdpartyService.recordSave(NbBankRecordEnum.Type.NOTIFY_MERCHANT.getCode(), request, response);
+
+            if (!StringUtils.equals(data.getString("errorCode"), "000000")){
+                log.info("宁波银行, 下单失败(notifyMerchant), code:{}, msg:{}", data.getString("errorCode"), data.getString("errorMsg"));
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
+            }
+
+            String merSeqNo = data.getString("merSeqNo");
+            String transSeqNo = data.getString("transSeqNo");
+            BigDecimal trxAmt = data.getBigDecimal("trxAmt");
+            BigDecimal realTrxAmt = data.getBigDecimal("realTrxAmt");
+            String transStatus = data.getString("transStatus");
+            String signNo = data.getString("signNo");
+
+            // 回调
+            bankService.orderPayCallback(merSeqNo, transSeqNo, trxAmt, realTrxAmt, transStatus, signNo);
+
+        }catch (Exception e){
+            throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_NOTIFY_ERROR);
+        }
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java

+package com.clx.performance.service.impl.thirdparty.nbbank;
+
+import com.alibaba.fastjson.JSONObject;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.service.thirdparty.nbbank.NbBankService;
+import com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderPayStatusResultVO;
+import com.msl.common.exception.ServiceSystemException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 易付通
+ */
+@Slf4j
+@Service
+public class NbBankServiceImpl implements NbBankService {
+
+    @Autowired
+    private NbBankThirdpartyService bankThirdpartyService;
+
+    /**
+     * 订单支付
+     * @return
+     * 第三方流水号
+     */
+    @Override
+    public NbBankOrderPayResultVO orderPay(Integer payType) {
+        if (payType == 1){
+            String merSeqNo = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+            JSONObject data = bankThirdpartyService.directBankTransferOrder(merSeqNo, "EFT33021200556315", 1);
+
+            String transSeqNo = data.getString("transSeqNo");
+            String signNo = data.getString("signNo");
+
+            NbBankOrderPayResultVO result = new NbBankOrderPayResultVO();
+            result.setAmount(1);
+            result.setMerSeqNo(merSeqNo);
+            result.setTransSeqNo(transSeqNo);
+            result.setSignNo(signNo);
+
+            return result;
+        }
+        else if (payType == 2){
+            String merSeqNo = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+            JSONObject data = bankThirdpartyService.unionPayDirectOrder(merSeqNo, "EFT33021200556315", 1,
+                    "313332082914","86041110000076809", "黑玫瑰");
+
+            String transSeqNo = data.getString("transSeqNo");
+            NbBankOrderPayResultVO result = new NbBankOrderPayResultVO();
+            result.setAmount(1);
+            result.setMerSeqNo(merSeqNo);
+            result.setTransSeqNo(transSeqNo);
+
+            return result;
+        }
+
+        throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_PAY_TYPE_ERROR);
+    }
+
+    /**
+     * 获取交易状态
+     * @return
+     */
+    @Override
+    public NbBankOrderPayStatusResultVO getOrderStatus(String merSeqNo) {
+        JSONObject data = bankThirdpartyService.queryOrder(merSeqNo);
+
+        NbBankOrderPayStatusResultVO result = new NbBankOrderPayStatusResultVO();
+
+        String transStatus = data.getString("transStatus");
+        if (StringUtils.equals(transStatus, "00")){result.setTransStatus(1);}            //交易成功
+        else if (StringUtils.equals(transStatus, "01")){result.setTransStatus(2);}       //交易失败
+        else if (StringUtils.equals(transStatus, "02")){result.setTransStatus(3);}       //交易已受理
+        else if (StringUtils.equals(transStatus, "80")){result.setTransStatus(4);}       //订单初始状态
+        else if (StringUtils.equals(transStatus, "90")){result.setTransStatus(5);}       //交易不存在
+        else if (StringUtils.equals(transStatus, "99")){result.setTransStatus(6);}       //交易超时,须发起交易结果查询
+
+        BigDecimal trxAmt = data.getBigDecimal("trxAmt");
+        BigDecimal realTrxAmt = data.getBigDecimal("realTrxAmt");
+        String transSeqNo = data.getString("transSeqNo");
+        String signNo = data.getString("signNo");
+
+        result.setAmount(trxAmt==null? null : trxAmt.movePointLeft(2).intValue());
+        result.setRealAmount(trxAmt==null? null : realTrxAmt.movePointLeft(2).intValue());
+        result.setMerSeqNo(merSeqNo);
+        result.setTransSeqNo(transSeqNo);
+        result.setSignNo(signNo);
+
+        return result;
+    }
+
+    @Override
+    public void orderPayCallback(String merSeqNo, String transSeqNo,
+                                 BigDecimal trxAmt, BigDecimal realTrxAmt,
+                                 String transStatus,
+                                 String signNo) {
+        log.info("宁波银行支付回调, merSeqNo:{}, transSeqNo:{}, trxAmt:{}, realTrxAmt:{}, transSeqNo:{}, signNo:{}",
+                merSeqNo, transSeqNo, trxAmt, realTrxAmt, transStatus, signNo);
+
+        if (StringUtils.equals(transStatus, "00")){     //交易成功
+
+        }
+        if (StringUtils.equals(transStatus, "01")){     //交易失败
+
+        }
+        if (StringUtils.equals(transStatus, "02")){     //交易已受理
+
+        }
+        if (StringUtils.equals(transStatus, "80")){     //订单初始状态
+
+        }
+        if (StringUtils.equals(transStatus, "90")){     //交易不存在
+
+        }
+        if (StringUtils.equals(transStatus, "99")){     //交易超时,须发起交易结果查询
+
+        }
+
+    }
+
+}