提交 70c42642 authored 作者: liuhaiquan's avatar liuhaiquan

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

Former-commit-id: bc0d9ccf
...@@ -26,6 +26,11 @@ public class OwnerLoanRecordParam { ...@@ -26,6 +26,11 @@ public class OwnerLoanRecordParam {
@NotBlank(message = "借款方不能为空") @NotBlank(message = "借款方不能为空")
private String borrower; private String borrower;
@ApiModelProperty(value = "收款方")
private String payee;
@ApiModelProperty(value = "收款方账户")
private String payeeAccount;
@ApiModelProperty(value = "借出方", example = "诚联信网络科技有限公司") @ApiModelProperty(value = "借出方", example = "诚联信网络科技有限公司")
@NotBlank(message = "借出方不能为空") @NotBlank(message = "借出方不能为空")
......
...@@ -61,7 +61,7 @@ public class CarrierPageSettlementDriverDetailVO { ...@@ -61,7 +61,7 @@ public class CarrierPageSettlementDriverDetailVO {
private BigDecimal prepayFreight; private BigDecimal prepayFreight;
@ApiModelProperty(value = "预付运费标示 0:未预付 1:已预付") @ApiModelProperty(value = "预付运费标示 0:未预付 1:已预付")
private Integer prepayFreightFlag; private Integer prepayFreightFlag;
@ApiModelProperty(value = "借款标示 0:未借款 1:已借款") @ApiModelProperty(value = "借款标示 0:未借款 1:已借款 2:已还款")
private Integer loanFlag; private Integer loanFlag;
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty(value = "结算金额") @ApiModelProperty(value = "结算金额")
......
...@@ -60,7 +60,7 @@ public class CarrierPageSettlementDriverVO { ...@@ -60,7 +60,7 @@ public class CarrierPageSettlementDriverVO {
private BigDecimal prepayFreight; private BigDecimal prepayFreight;
@ApiModelProperty(value = "预付运费标示 0:未预付 1:已预付") @ApiModelProperty(value = "预付运费标示 0:未预付 1:已预付")
private Integer prepayFreightFlag; private Integer prepayFreightFlag;
@ApiModelProperty(value = "借款标示 0:未借款 1:已借款") @ApiModelProperty(value = "借款标示 0:未借款 1:已借款 2:已还款")
private Integer loanFlag; private Integer loanFlag;
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty(value = "结算金额") @ApiModelProperty(value = "结算金额")
......
...@@ -45,6 +45,8 @@ public class CarrierPageSettlementOwnerVO { ...@@ -45,6 +45,8 @@ public class CarrierPageSettlementOwnerVO {
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty(value = "结算金额") @ApiModelProperty(value = "结算金额")
private BigDecimal settlementFreight; private BigDecimal settlementFreight;
@ApiModelProperty(value = "借款金额")
private BigDecimal loanFreight;
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty(value = "开票金额") @ApiModelProperty(value = "开票金额")
private BigDecimal invoiceFreight; private BigDecimal invoiceFreight;
......
...@@ -65,6 +65,10 @@ public class CarrierSettlementOwnerDetailVO { ...@@ -65,6 +65,10 @@ public class CarrierSettlementOwnerDetailVO {
@MoneyOutConvert @MoneyOutConvert
private BigDecimal settlementFreight; private BigDecimal settlementFreight;
@ApiModelProperty(value = "借款金额(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal loanFreight;
@ApiModelProperty(value = "开票标识:1网运单 2普通单", example = "1") @ApiModelProperty(value = "开票标识:1网运单 2普通单", example = "1")
private Integer invoiceTypeCode; private Integer invoiceTypeCode;
......
...@@ -36,11 +36,15 @@ public class CarrierCashierInfoVO { ...@@ -36,11 +36,15 @@ public class CarrierCashierInfoVO {
@ApiModelProperty("订单金额") @ApiModelProperty("订单金额")
private BigDecimal loanBalance; private BigDecimal loanBalance;
@ApiModelProperty("支付方式") @ApiModelProperty("是否有订单支付方式 true:有 false:没有")
private List<Integer> payWay; private Boolean orderPayWay;
@ApiModelProperty("付款账户") @ApiModelProperty("付款账户")
private String payAccount; private String payAccount;
@ApiModelProperty("银行名称")
private String bankName;
} }
...@@ -36,11 +36,14 @@ public class OwnerCashierInfoVO { ...@@ -36,11 +36,14 @@ public class OwnerCashierInfoVO {
@ApiModelProperty("订单金额") @ApiModelProperty("订单金额")
private BigDecimal repaymentBalance; private BigDecimal repaymentBalance;
@ApiModelProperty("支付方式") @ApiModelProperty("是否有订单支付方式 true:有 false:没有")
private List<Integer> payWay; private Boolean orderPayWay;
@ApiModelProperty("付款账户") @ApiModelProperty("付款账户")
private String payAccount; private String payAccount;
@ApiModelProperty("银行名称")
private String bankName;
} }
...@@ -69,6 +69,10 @@ public class PageOwnerSettlementOwnerDetailVO { ...@@ -69,6 +69,10 @@ public class PageOwnerSettlementOwnerDetailVO {
@ApiModelProperty(value="结算金额",example = "1.2") @ApiModelProperty(value="结算金额",example = "1.2")
private BigDecimal settlementFreight; private BigDecimal settlementFreight;
@MoneyOutConvert
@ApiModelProperty(value="借款抵扣金额",example = "1.2")
private BigDecimal loanFreight;
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty(value="开票金额",example = "2.1") @ApiModelProperty(value="开票金额",example = "2.1")
private BigDecimal invoiceFreight; private BigDecimal invoiceFreight;
......
...@@ -40,8 +40,6 @@ public class CarrierSettlementOwnerController { ...@@ -40,8 +40,6 @@ public class CarrierSettlementOwnerController {
return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id)); return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
} }
@ApiOperation(value = "承运端-结算单列表(货主)",notes = "<br>By:刘海泉") @ApiOperation(value = "承运端-结算单列表(货主)",notes = "<br>By:刘海泉")
@PostMapping("/pageCarrierSettlementOwner") @PostMapping("/pageCarrierSettlementOwner")
@UnitCovert(param = false) @UnitCovert(param = false)
......
...@@ -43,7 +43,7 @@ public class SettlementDriver implements HasKey<Integer> { ...@@ -43,7 +43,7 @@ public class SettlementDriver implements HasKey<Integer> {
private BigDecimal lossWeight; //货损吨数 private BigDecimal lossWeight; //货损吨数
private BigDecimal lossFreight; //货损金额(分) private BigDecimal lossFreight; //货损金额(分)
private BigDecimal settlementFreight; //结算金额(分) private BigDecimal settlementFreight; //结算金额(分)
private Integer loanFlag; //借款标示 0:未借款 1:已借款 private Integer loanFlag; //借款标示 0:未借款 1:已借款 2:已还款
private Integer invoiceType; //开票标识:1网运单 2普通单 private Integer invoiceType; //开票标识:1网运单 2普通单
private String settlementPlatform; //结算平台 private String settlementPlatform; //结算平台
private Integer prepayFreightFlag; //预付运费标示 0:未预付 1:已预付 private Integer prepayFreightFlag; //预付运费标示 0:未预付 1:已预付
......
...@@ -44,7 +44,7 @@ public class SettlementDriverDetail implements HasKey<Integer> { ...@@ -44,7 +44,7 @@ public class SettlementDriverDetail implements HasKey<Integer> {
private BigDecimal lossFreight; //货损金额(分) private BigDecimal lossFreight; //货损金额(分)
private BigDecimal prepayFreight; //预付运费金额(分) private BigDecimal prepayFreight; //预付运费金额(分)
private Integer prepayFreightFlag; //预付运费标示 0:未预付 1:已预付 private Integer prepayFreightFlag; //预付运费标示 0:未预付 1:已预付
private Integer loanFlag; //借款标示 0:未借款 1:已借款 private Integer loanFlag; //借款标示 0:未借款 1:已借款 2:已还款
private BigDecimal settlementFreight; //结算金额(分) private BigDecimal settlementFreight; //结算金额(分)
private Integer invoiceType; //开票标识:1网运单 2普通单 private Integer invoiceType; //开票标识:1网运单 2普通单
private Integer status; //状态 private Integer status; //状态
......
...@@ -111,7 +111,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -111,7 +111,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
return returnPage; return returnPage;
} }
@Override @Override
public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) { public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) {
...@@ -131,8 +130,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -131,8 +130,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
entity.setBorrower(param.getBorrower()); entity.setBorrower(param.getBorrower());
entity.setBorrowerAccount(ownerBindCardRecord.getBankCardNumber()); entity.setBorrowerAccount(ownerBindCardRecord.getBankCardNumber());
entity.setLendingParty(param.getLendingParty()); entity.setLendingParty(param.getLendingParty());
entity.setPayee("收款方写死"); entity.setPayee(param.getPayee());
entity.setPayeeAccount("收款方账户写死"); entity.setPayeeAccount(param.getPayeeAccount());
entity.setCreateBy(loginUserInfo.getUserName()); entity.setCreateBy(loginUserInfo.getUserName());
entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode()); entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
ownerLoanRecordDao.saveEntity(entity); ownerLoanRecordDao.saveEntity(entity);
...@@ -319,7 +318,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -319,7 +318,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow( OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
PerformanceResultEnum.DATA_NOT_FIND); PerformanceResultEnum.DATA_NOT_FIND);
CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord); CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
//TODO 设置支付方式和付款账户 ,宇帆提供 //TODO 设置支付方式和付款账户和银行名称 ,宇帆提供
return vo; return vo;
} }
......
...@@ -72,7 +72,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService { ...@@ -72,7 +72,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow( OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
PerformanceResultEnum.DATA_NOT_FIND); PerformanceResultEnum.DATA_NOT_FIND);
OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment); OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
//TODO 设置支付方式和付款账户 ,宇帆提供 //TODO 设置支付方式和付款账户和银行名称 ,宇帆提供
return vo; return vo;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论