diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java index 3fcf6ef676..048f888ac5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java @@ -10,7 +10,7 @@ import lombok.Data; */ @Data public class TransferPaymentVo implements Vo { - + private String sid; private String paymentState; //转付状态 private String vinNo; //车架号 private String loanContractNo; //贷款合同号 @@ -19,7 +19,9 @@ public class TransferPaymentVo implements Vo { private String borrowerName; //贷款人 private String period; //期数 private String dueDate; //应还日期 - private String dueMoney; //实还金额 + private String dueMoney; //应还金额 + private String actualDate; //实还日期 + private String actualMoney; //实还金额 private String prepareDate; //预转付日期 private String spread; //息差 private String transferPrincipal; //转付本金 @@ -27,6 +29,6 @@ public class TransferPaymentVo implements Vo { private String accountType; //转付账户类型 private String account; //转付账户 private String accountNumber; //转付账户账号 - + private String planDetailSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java index 5d63d070e3..85fc27849f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java @@ -30,6 +30,10 @@ import java.util.List; public interface LoanTransferPaymentApplyFeign { + @ApiOperation("新增初始化") + @PostMapping("/paymentInit") + @ResponseBody + public ResultBean paymentInit(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java index 637dc95fea..319564c0a3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java @@ -14,4 +14,8 @@ import java.util.List; @Component public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymentApplyFeign { + @Override + public ResultBean paymentInit(String[] sids) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java index c40c2e9665..7451c2bc60 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author liupopo * @version 1.0 @@ -21,5 +23,20 @@ public class LoanTransferPaymentRecord extends BaseEntity { private String mainSid; @ApiModelProperty("还款记录sid") private String repaymentHistorySid; + @ApiModelProperty("息差") + private BigDecimal spread; + @ApiModelProperty("转付本金") + private BigDecimal transferPrincipal; + @ApiModelProperty("转付罚息") + private BigDecimal defaultInterest; + @ApiModelProperty("转付账户类型") + private String accountType; + @ApiModelProperty("转付账户类型key") + private String accountTypeKey; + @ApiModelProperty("转付账户") + private String account; + @ApiModelProperty("转付账户账号") + private String accountNumber; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 0c82b53315..f90e41fe03 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -139,7 +139,36 @@ \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 197099c47b..1baf08adc9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -775,6 +775,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + dueStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" ); + String prepareStartDate = pagerQuery.getPrepareStartDate(); + String prepareEndDate = pagerQuery.getPrepareEndDate(); + qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (h.prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (h.prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')" + ); IPage pagging = baseMapper.transferPaymentList(page, qw); - List records = pagging.getRecords(); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java index 7907d2b9ea..ccff9d5c72 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java @@ -7,6 +7,7 @@ import com.yxt.anrui.riskcenter.api.loanbuckleapply.*; import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign; +import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyInit; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -23,6 +24,11 @@ import java.util.List; @RequestMapping("v1/loantransferpaymentapply") public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFeign { + @Autowired + private LoanTransferPaymentApplyService loanTransferPaymentApplyService; - + @Override + public ResultBean paymentInit(String[] sids) { + return loanTransferPaymentApplyService.paymentInit(sids); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index dd6cbae64f..9f39e1d80d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply; +import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyInit; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; @@ -66,5 +67,21 @@ import java.util.stream.Collectors; public class LoanTransferPaymentApplyService extends MybatisBaseService { - + public ResultBean paymentInit(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + LoanTransferPaymentApplyInit vo = new LoanTransferPaymentApplyInit(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + vo.setApplyDate(sdf.format(new Date())); + List historyRecords = new ArrayList<>(); +// for (String sid : sids) { +// LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord(); +// LoanRepaymentHistoryRecordVo recordVo = loanRepaymentHistoryService.buckleInfo(sid).getData(); +// if (null != recordVo) { +// BeanUtil.copyProperties(recordVo, record); +// } +// historyRecords.add(record); +// } +// vo.setRecords(historyRecords); + return rb.success().setData(vo); + } }