Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

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

@@ -117,12 +117,18 @@ public enum PerformanceResultEnum implements ResultEnum {
     BORROWER_DELETE_ENABLE_ERROR(1702, "无法删除启用数据"),
     BORROWER_CONFIG_BORROWER_ID_EXIST(1703, "数据重复，请核实后重新提交"),
     BORROWER_CONFIG_DELETE_ENABLE_ERROR(1704, "无法删除启用数据"),
+    BORROWER_CONFIG_TYPE_NOT_SUPPORT_ERROR(1705, "借款类型不支持"),
 
     NB_BANK_API_ERROR(1800, "宁波银行api调用失败"),
     NB_BANK_NOTIFY_ERROR(1801, "宁波银行回调失败"),
     NB_BANK_PAY_TYPE_ERROR(1802, "支付方式不支持"),
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
 
+    GET_LOAN_RECORD(1901, "货主借款失败"),
+
+
+    OWNER_LOAN_RECORD_PAY_STATUS_ERROR(1850, "状态已变更无法支付"),
+
     ;
     private final int code;
     private final String msg;

performance-api/src/main/java/com/clx/performance/enums/loan/BankTradeEnum.java

+package com.clx.performance.enums.loan;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum BankTradeEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum TradeType {
+        ORDER_DIRECT_PAY(1, "订单支付"),
+        ORDER_TRANSFER_PAY(2, "转账支付"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<TradeType> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
+        }
+
+        public static String getMsgByCode(Integer code) {
+            return getByCode(code).map(TradeType::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum OrderType {
+        OWNER_LOAN_RECORD(1, "货主借款"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<OrderType> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code , code)).findFirst();
+        }
+
+        public static String getMsgByCode(Integer code) {
+            return getByCode(code).map(OrderType::getMsg).orElse(null);
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanAccountRunningWaterRecordEnum.java

@@ -14,10 +14,10 @@ public enum OwnerLoanAccountRunningWaterRecordEnum {
     @Getter
     @AllArgsConstructor
     public enum RunWaterType {
-        APPROVE_WAIT(10, "借款"),
-        APPROVE_FROZEN(20, "冻结"),
-        APPROVE_CHILD_WRITE_OFF(30, "运单核销"),
-        APPROVE_THAW(40, "解冻"),
+        APPROVE_WAIT(80, "借款"),
+        APPROVE_FROZEN(90, "冻结"),
+        APPROVE_CHILD_WRITE_OFF(100, "运单核销"),
+        APPROVE_THAW(110, "解冻"),
         ;
 
         private final Integer code;

performance-api/src/main/java/com/clx/performance/enums/loan/OwnerLoanRecordEnum.java

@@ -54,4 +54,24 @@ public enum OwnerLoanRecordEnum {
         }
     }
 
+
+    @Getter
+    @AllArgsConstructor
+    public enum PayChannel {
+        ORDER_DIRECT_PAY(1, "订单支付"),
+        ORDER_TRANSFER_PAY(2, "转账支付"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<PayChannel> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e ->Objects.equals(e.code, code)).findFirst();
+        }
+
+        public static String getMsgByCode(Integer code) {
+            return getByCode(code).map(PayChannel::getMsg).orElse(null);
+        }
+    }
+
 }

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/CarrierOwnerLoanRecordApproveParam.java

@@ -20,4 +20,8 @@ public class CarrierOwnerLoanRecordApproveParam {
 
     @ApiModelProperty("1:虚拟货币  2：资金")
     private Integer loanType;
+
+    @ApiModelProperty("支付通道：1订单支付  2转账支付")
+    private Integer payChannel;
+
 }

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/CarrierOwnerLoanRecordPayCancelParam.java

+package com.clx.performance.param.pc.loan.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class CarrierOwnerLoanRecordPayCancelParam {
+
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/CarrierOwnerLoanRecordPayParam.java

+package com.clx.performance.param.pc.loan.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class CarrierOwnerLoanRecordPayParam {
+
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
+    @ApiModelProperty("支付通道：1订单支付 2转账支付")
+    private Integer payChannel;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/CarrierOwnerLoanRecordRepayParam.java

+package com.clx.performance.param.pc.loan.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class CarrierOwnerLoanRecordRepayParam {
+
+    @ApiModelProperty("借款单号")
+    private Long loanNo;
+
+    @ApiModelProperty("支付通道：1订单支付 2转账支付")
+    private Integer payChannel;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanRecordVO.java

@@ -66,7 +66,9 @@ public class OwnerLoanRecordVO {
     @ApiModelProperty("借款方")
     private String borrower;
 
-   
+    @ApiModelProperty("借出方ID")
+    private String lendingPartyId;
+
     @ApiModelProperty("借出方")
     private String lendingParty;
 

performance-web/src/main/java/com/clx/performance/config/loan/PaymentFromConfig.java

@@ -12,13 +12,13 @@ import org.springframework.context.annotation.Configuration;
 public class PaymentFromConfig {
 
     //借款订单模版编号
-    private Long loanOrderTemplateNo;
+    private String loanOrderTemplateNo;
     //借款转账模版编号
-    private Long loanTransferTemplateNo;
+    private String loanTransferTemplateNo;
 
     //还款订单模版编号
-    private Long repaymentOrderTemplateNo;
+    private String repaymentOrderTemplateNo;
     //还款转账模版编号
-    private Long repaymentTransferTemplateNo;
+    private String repaymentTransferTemplateNo;
 
 }

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

@@ -10,4 +10,6 @@ public class RedissonConstants {
     //货主违约结算单支付锁
     public static final String BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:breakContractSettlementOwner:batchPay:id:";
 
+    public static final String ORDER_CHILD_LOAN_OWNER_USERID_LOCK = "clx-performance:orderChild:loan:ownerUserId:";
+
 }

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

 package com.clx.performance.controller.pc.loan.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.loan.carrier.CarrierOwnerLoanRecordApproveParam;
-import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
-import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
+import com.clx.performance.param.pc.loan.carrier.*;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
@@ -90,4 +88,25 @@ public class CarrierOwnerLoanRecordController {
         return Result.ok(url);
     }
 
+    @ApiOperation(value = "借款支付",notes = "<br>By:艾庆国")
+    @PostMapping("/updateOwnerLoanRecordPay")
+    public Result<Object> updateOwnerLoanRecordPay(@RequestBody @Validated CarrierOwnerLoanRecordPayParam param) {
+        ownerLoanRecordService.updateOwnerLoanRecordPay(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "借款重新支付",notes = "<br>By:艾庆国")
+    @PostMapping("/updateOwnerLoanRecordRepay")
+    public Result<Object> updateOwnerLoanRecordRepay(@RequestBody @Validated CarrierOwnerLoanRecordRepayParam param) {
+        ownerLoanRecordService.updateOwnerLoanRecordRepay(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "借款支付取消",notes = "<br>By:艾庆国")
+    @PostMapping("/updateOwnerLoanRecordPayCancel")
+    public Result<Object> updateOwnerLoanRecordPayCancel(@RequestBody @Validated CarrierOwnerLoanRecordPayCancelParam param) {
+        ownerLoanRecordService.updateOwnerLoanRecordPayCancel(param);
+        return Result.ok();
+    }
+
 }

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

+package com.clx.performance.dao.impl.loan;
+
+
+import com.clx.performance.dao.loan.BankTradeDao;
+import com.clx.performance.mapper.loan.BankTradeMapper;
+import com.clx.performance.model.loan.BankTrade;
+import com.msl.common.base.Optional;
+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 BankTradeDaoImpl extends BaseDaoImpl<BankTradeMapper, BankTrade, Integer> implements BankTradeDao {
+
+    @Override
+    public boolean updateStatus(BankTrade item) {
+        return update(lUdWrapper()
+                .eq(BankTrade::getId, item.getId())
+                .set(BankTrade::getStatus, item.getStatus())
+        );
+    }
+
+    @Override
+    public Optional<BankTrade> selectByMerchantRunningWaterNo(String merchantRunningWaterNo) {
+        return Optional.of(merchantRunningWaterNo)
+                .map(item -> lQrWrapper()
+                        .eq(BankTrade::getMerchantRunningWaterNo, item)
+                        .last("limit 1")
+                )
+                .map(super::getOne);
+    }
+}

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

@@ -10,6 +10,7 @@ import com.clx.performance.model.loan.OwnerLoanRecord;
 import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -70,5 +71,40 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
         );
     }
 
+    @Override
+    public Optional<OwnerLoanRecord> selectByMerchantRunningWaterNo(String merchantRunningWaterNo) {
+        return Optional.of(merchantRunningWaterNo)
+                .map(item -> lQrWrapper()
+                        .eq(OwnerLoanRecord::getMerchantRunningWaterNo, item)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public boolean updatePay(OwnerLoanRecord item) {
+        return update(lUdWrapper()
+                .eq(OwnerLoanRecord::getId, item.getId())
+                .set(OwnerLoanRecord::getStatus, item.getStatus())
+
+                .set(OwnerLoanRecord::getRunningWaterOpenNo, item.getRunningWaterOpenNo())
+                .set(OwnerLoanRecord::getMerchantRunningWaterNo, item.getMerchantRunningWaterNo())
+                .set(OwnerLoanRecord::getRemittanceIdentificationCode, item.getRemittanceIdentificationCode())
+                .set(OwnerLoanRecord::getLoanResidueBalance, item.getLoanResidueBalance())
+
+                .set(OwnerLoanRecord::getLendingParty, item.getLendingParty())
+                .set(OwnerLoanRecord::getLendingPartyAccount, item.getLendingPartyAccount())
+        );
+    }
+
+    @Override
+    public boolean updatePaySuccess(OwnerLoanRecord item) {
+        return false;
+    }
+
+    @Override
+    public boolean updatePayFail(OwnerLoanRecord item) {
+        return false;
+    }
+
 
 }

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

@@ -31,6 +31,7 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
                 .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
                 .set(SettlementDriverDetail::getPrepayFreight, item.getPrepayFreight())
                 .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
+                .set(SettlementDriverDetail::getLoanFlag, item.getLoanFlag())
         );
     }
 

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

@@ -36,6 +36,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .set(SettlementOwnerDetail::getSettlementFreight, item.getSettlementFreight())
                 .set(SettlementOwnerDetail::getFinalPaymentStatus, item.getFinalPaymentStatus())
                 .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementOwnerDetail::getLoanFreight, item.getLoanFreight())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/loan/BankTradeDao.java

+package com.clx.performance.dao.loan;
+
+
+import com.clx.performance.mapper.loan.BankTradeMapper;
+import com.clx.performance.model.loan.BankTrade;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description:
+ * @Date: 2024/01/17 13:42:57
+ * @Version: 1.0
+ */
+public interface BankTradeDao extends BaseDao<BankTradeMapper, BankTrade, Integer> {
+
+    boolean updateStatus(BankTrade item);
+
+    Optional<BankTrade> selectByMerchantRunningWaterNo(String merchantRunningWaterNo);
+
+}

performance-web/src/main/java/com/clx/performance/dao/loan/OwnerLoanRecordDao.java

@@ -6,6 +6,7 @@ import com.clx.performance.model.loan.OwnerLoanRecord;
 import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
@@ -23,5 +24,10 @@ public interface OwnerLoanRecordDao extends BaseDao<OwnerLoanRecordMapper, Owner
 
     List<OwnerLoanRecord> selectLoanBalance(Long userNo);
 
+    Optional<OwnerLoanRecord> selectByMerchantRunningWaterNo(String merchantRunningWaterNo);
+
+    boolean updatePay(OwnerLoanRecord item);
+    boolean updatePaySuccess(OwnerLoanRecord item);
+    boolean updatePayFail(OwnerLoanRecord item);
 
 }

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

+package com.clx.performance.dto;
+
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LoanBalanceDTO {
+
+    private BigDecimal orderChildPrice;
+
+    private Long ownerUserNo;
+
+    private String childNo;
+
+    private SettlementDriverDetail settlementDriverDetail;
+
+    private SettlementOwnerDetail settlementOwnerDetail;
+}

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

@@ -28,6 +28,7 @@ import com.clx.performance.service.settle.SettlementMqService;
 import com.msl.common.dto.HttpDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
@@ -74,7 +75,7 @@ public class OrderChildSyncTransportListener {
         try {
             transportOrderChildProcess(orderChild);
         } catch (Exception e) {
-            log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), e.getMessage());
+            log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
 
             OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
             entity.setChildNo(orderChild.getChildNo());
@@ -103,8 +104,6 @@ public class OrderChildSyncTransportListener {
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,
                            SettlementOwnerDetail settlementOwnerDetail,
                            Integer invoiceType, SettlementDriverDetail settlementDriverDetail) {
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         if (null != bean  && bean.getCode() == 0) {
             log.info("当前OrderChildSyncTransportListener监听同步网络货运成功,运单号为{}", orderChild.getChildNo());
@@ -165,6 +164,8 @@ public class OrderChildSyncTransportListener {
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         }
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
@@ -177,6 +178,7 @@ public class OrderChildSyncTransportListener {
         }
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
+
         //生成借款标识
         orderChildLoanComponent.childLoanConfirmAfterProcess(settlementDriverDetail, settlementOwnerDetail);
 

performance-web/src/main/java/com/clx/performance/mapper/loan/BankTradeMapper.java

+package com.clx.performance.mapper.loan;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.loan.BankTrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Author: aiqinguo
+* @Description:
+* @Date: 2024/01/17 13:42:57
+* @Version: 1.0
+*/
+
+@Mapper
+public interface BankTradeMapper extends BaseMapper<BankTrade> {
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanAccountMapper.java

@@ -18,9 +18,11 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
 
-    @Update("update owner_loan_account set funding_amount = funding_amount + #{account.fundingAmount}"
-            + ",virtually_amount = virtually_amount + #{account.virtuallyAmount}"
-            + ",modified_time= #{now}"
+    @Update("update owner_loan_account set funding_account_balance = funding_account_balance + #{account.fundingAccountBalance}" +
+            ",funding_usable_balance = funding_usable_balance + #{account.fundingUsableBalance},funding_frozen_balance = funding_frozen_balance + #{account.fundingFrozenBalance}" +
+            ",virtually_account_balance = virtually_account_balance + #{account.virtuallyAccountBalance},virtually_usable_balance = virtually_usable_balance + #{account.virtuallyUsableBalance}" +
+            ",virtually_frozen_balance = virtually_frozen_balance + #{account.virtuallyFrozenBalance}" +
+            ",modified_time=#{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )
     Integer addAccount(@Param("account") OwnerLoanAccount account, @Param("now") String nowStr);
@@ -47,7 +49,7 @@ public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
             ",modified_time=#{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )
-    Integer childWriteOffOwnerLoanAccountCAS(OwnerLoanAccount account, String nowStr);
+    Integer childWriteOffOwnerLoanAccountCAS(@Param("account") OwnerLoanAccount account, @Param("now") String nowStr);
 
     @Update("update owner_loan_account set funding_account_balance = funding_account_balance + #{account.fundingAccountBalance}" +
             ",funding_usable_balance = funding_usable_balance + #{account.fundingUsableBalance},funding_frozen_balance = funding_frozen_balance - #{account.fundingFrozenBalance}" +
@@ -56,5 +58,5 @@ public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
             ",modified_time=#{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )
-    Integer thawOwnerLoanAccountCAS(OwnerLoanAccount account, String nowStr);
+    Integer thawOwnerLoanAccountCAS(@Param("account") OwnerLoanAccount account, @Param("now") String nowStr);
 }

performance-web/src/main/java/com/clx/performance/model/loan/BankTrade.java

+package com.clx.performance.model.loan;
+
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description:
+* @Date: 2024/02/06 15:31:16
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class BankTrade implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private Integer orderType;                      //订单类型
+    private Integer tradeType;                      //交易类型
+    private String merchantRunningWaterNo;          //商户流水号
+    private String runningWaterOpenNo;              //交易流水号（第三方）
+    private BigDecimal amount;                      //金额
+    private Integer status;                         //状态
+    private String remark;                          //备注
+    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/loan/OwnerLoanRecord.java

@@ -68,6 +68,10 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @ApiModelProperty("借款剩余金额")
     private BigDecimal loanResidueBalance;
 
+    @TableField("borrower_id")
+    @ApiModelProperty("借款方Id")
+    private Integer borrowerId;
+
     @TableField("borrower")
     @ApiModelProperty("借款方")
     private String borrower;
@@ -80,6 +84,10 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @ApiModelProperty("汇款识别码")
     private String remittanceIdentificationCode;
 
+    @TableField("lending_party_id")
+    @ApiModelProperty("借出方ID")
+    private String lendingPartyId;
+
     @TableField("lending_party")
     @ApiModelProperty("借出方")
     private String lendingParty;

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

@@ -108,9 +108,9 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
         if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){
-            feignParam.setTemplateNo(paymentFromConfig.getRepaymentOrderTemplateNo());
+            feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getRepaymentOrderTemplateNo()));
         }else{
-            feignParam.setTemplateNo(paymentFromConfig.getRepaymentTransferTemplateNo());
+            feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getRepaymentTransferTemplateNo()));
         }
 
         feignParam.setParametersValueMap(map);

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

@@ -2,11 +2,16 @@ package com.clx.performance.service.impl.thirdparty.nbbank;
 
 import com.alibaba.fastjson.JSONObject;
 import com.clx.performance.component.IdGenerateSnowFlake;
+import com.clx.performance.dao.loan.BankTradeDao;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.loan.BankTradeEnum;
 import com.clx.performance.enums.nbbank.NbBankStatusEnum;
+import com.clx.performance.model.loan.BankTrade;
+import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.service.thirdparty.nbbank.NbBankService;
 import com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService;
 import com.clx.performance.utils.LocalDateTimeUtils;
+import com.clx.performance.utils.SpringContextUtils;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderResultVO;
 import com.msl.common.exception.ServiceSystemException;
@@ -16,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * 易付通
@@ -24,6 +30,9 @@ import java.math.BigDecimal;
 @Service
 public class NbBankServiceImpl implements NbBankService {
 
+    @Autowired
+    private BankTradeDao bankTradeDao;
+
     @Autowired
     private NbBankThirdpartyService bankThirdpartyService;
 
@@ -69,7 +78,7 @@ public class NbBankServiceImpl implements NbBankService {
     @Override
     public NbBankOrderPayResultVO orderDirectPay(Long loanNo, Integer amount,
                                                  String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
-        String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
+        String merSeqNo = String.valueOf(loanNo);
 
         String merDtTm = LocalDateTimeUtils.formatTime();
         String closeDtTm = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.parseTime(merDtTm).plusDays(30));
@@ -214,6 +223,30 @@ public class NbBankServiceImpl implements NbBankService {
         log.info("宁波银行支付回调, merSeqNo:{}, transSeqNo:{}, trxAmt:{}, realTrxAmt:{}, transSeqNo:{}, signNo:{}",
                 merSeqNo, transSeqNo, trxAmt, realTrxAmt, transStatus, signNo);
 
+        BankTrade bankTrade = bankTradeDao.selectByMerchantRunningWaterNo(merSeqNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        bankTrade.setStatus(transStatus);
+
+        // 更新状态
+        bankTradeDao.updateStatus(bankTrade);
+
+        // 货主借款支付回调
+        if (Objects.equals(bankTrade.getOrderType(), BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode())){
+
+            if (Objects.equals(transStatus, NbBankStatusEnum.Status.SUCCESS.getCode())) {
+
+                SpringContextUtils.getBeanByClass(OwnerLoanRecordService.class).paySuccess(merSeqNo);
+            }
+            else if (Objects.equals(transStatus, NbBankStatusEnum.Status.FAIL.getCode())) {
+                SpringContextUtils.getBeanByClass(OwnerLoanRecordService.class).payFail(merSeqNo);
+            }
+            else {
+                // TODO 其它情况
+            }
+        }
+        else {
+
+        }
+
     }
 
     /**

performance-web/src/main/java/com/clx/performance/service/loan/OwnerLoanRecordService.java

 package com.clx.performance.service.loan;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.loan.carrier.CarrierOwnerLoanRecordApproveParam;
-import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
-import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
+import com.clx.performance.dto.LoanBalanceDTO;
+import com.clx.performance.param.pc.loan.carrier.*;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
-import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
 
-import java.math.BigDecimal;
+
 
 /**
  * @author kavin
@@ -38,5 +37,12 @@ public interface OwnerLoanRecordService {
 
     String savePaymentApplicationForm(ExportPaymentApplicationFormParam param);
 
-    void getLoanBalance(BigDecimal orderChildPrice, Long userNo, String childNo);
+    void getLoanBalance(LoanBalanceDTO param);
+    void updateOwnerLoanRecordPay(CarrierOwnerLoanRecordPayParam param);
+    void updateOwnerLoanRecordRepay(CarrierOwnerLoanRecordRepayParam param);
+    void updateOwnerLoanRecordPayCancel(CarrierOwnerLoanRecordPayCancelParam param);
+
+    void payFail(String loanNo);
+
+    void paySuccess(String loanNo);
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/loan/OwnerLoanRecordSqlProvider.java

@@ -19,7 +19,7 @@ public class OwnerLoanRecordSqlProvider {
                     " running_water_open_no as runningWaterOpenNo, merchant_running_water_no as merchantRunningWaterNo, " +
                     " loan_no as loanNo, loan_type as loanType, loan_balance as loanBalance, " +
                     " borrower, borrower_account as borrowerAccount, remittance_identification_code as remittanceIdentificationCode, " +
-                    " lending_party as lendingParty, lending_party_account as lendingPartyAccount, " +
+                    " lending_party_id as lendingPartyId, lending_party as lendingParty, lending_party_account as lendingPartyAccount, " +
                     " payee, payee_account as payeeAccount, " +
                     " status, " +
                     " date_format(approve_time, '%Y-%m-%d %H:%i:%s') as approveTime, approve_by as approveBy, " +