From 1f236e1ce49e6d6b6f40a7d9d2f5db9da269e70a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 15 Jul 2024 17:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=BF=98=E6=AC=BE=E8=AE=B0=E5=BD=95=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A1=A8=E6=A0=BC=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderBorrowerFeignFallback.java | 5 + .../WxRepaymentPlanDetails.java | 23 ++++ .../AppRepaymentHistoryListDetailsWxVo.java | 23 ++++ .../AppRepaymentHistoryRecord.java | 25 ++++ .../AppRepaymentHistoryThead.java | 20 ++++ .../AppRepaymentPlanListDetailsWxVo.java | 39 +++++++ .../AppRepaymentPlanRecord.java | 23 ++++ .../AppRepaymentPlanThead.java | 20 ++++ .../LoanRepaymentScheduleFeign.java | 12 +- .../LoanRepaymentScheduleFeignFallback.java | 10 ++ .../LoanRepaymentHistoryMapper.java | 3 + .../LoanRepaymentHistoryMapper.xml | 16 ++- .../LoanRepaymentHistoryService.java | 5 + .../LoanRepaymentPlanDetailsMapper.java | 3 + .../LoanRepaymentPlanDetailsMapper.xml | 50 ++++++++ .../LoanRepaymentPlanDetailsService.java | 4 + .../LoanRepaymentScheduleRest.java | 14 +++ .../LoanRepaymentScheduleService.java | 110 ++++++++++++++++-- .../RepaymentHistoryListDetailsWxVo.java | 23 ++++ .../repaymentplan/RepaymentHistoryRecord.java | 25 ++++ .../repaymentplan/RepaymentHistoryThead.java | 20 ++++ .../repaymentplan/RepaymentPlanFeign.java | 21 +++- .../RepaymentPlanFeignFallback.java | 10 ++ .../RepaymentPlanListDetailsWxVo.java | 39 +++++++ .../repaymentplan/RepaymentPlanRecord.java | 23 ++++ .../repaymentplan/RepaymentPlanThead.java | 21 ++++ .../risk/repaymentplan/RepaymentPlanRest.java | 10 ++ .../repaymentplan/RepaymentPlanService.java | 16 +++ 28 files changed, 598 insertions(+), 15 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/WxRepaymentPlanDetails.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryRecord.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryThead.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanThead.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryRecord.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryThead.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanRecord.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanThead.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java index d3a6126d7d..2931ca2fc3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java @@ -109,4 +109,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower public ResultBean saveList(List borrowers) { return null; } + + @Override + public ResultBean selectByCustomSid(String customSid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/WxRepaymentPlanDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/WxRepaymentPlanDetails.java new file mode 100644 index 0000000000..6200be6ff1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/WxRepaymentPlanDetails.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +public class WxRepaymentPlanDetails extends BaseEntity { + + @ApiModelProperty("月份") + private String dueDate; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还") + private String dueMoney; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java new file mode 100644 index 0000000000..1ff8ae38ea --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/9/11 14:26 + */ +@Data +public class AppRepaymentHistoryListDetailsWxVo implements Vo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("标题") + private List thead; + @ApiModelProperty("表格") + private List record; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryRecord.java new file mode 100644 index 0000000000..33edeecb76 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryRecord.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class AppRepaymentHistoryRecord implements Vo { + + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("款项类别") + private String kxType; + @ApiModelProperty("实还日期") + private String actualDate; + @ApiModelProperty("实还金额") + private String actualMoney; + @ApiModelProperty("还款方式") + private String returnWay; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryThead.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryThead.java new file mode 100644 index 0000000000..8ff0beddf7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryThead.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class AppRepaymentHistoryThead implements Vo { + + private String name; + private String label; + private Boolean fixed = false; + private String width; + private String emptyString; + private String align; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java new file mode 100644 index 0000000000..1bbcba4941 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/9/11 14:26 + */ +@Data +public class AppRepaymentPlanListDetailsWxVo implements Vo { + + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("贷款人名称") + private String lenderName; + @ApiModelProperty("销售专员") + private String salesName; + @ApiModelProperty("主产品资方") + private String management; + @ApiModelProperty("主产品期数/还款日") + private String zcpDate; + @ApiModelProperty("其他融资方") + private String otherManagement; + @ApiModelProperty("其他融期数/还款日") + private String ptrDate; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("下载路径") + private String downloadUrl; + @ApiModelProperty("标题") + private List thead; + @ApiModelProperty("表格") + private List record; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java new file mode 100644 index 0000000000..3471763d0a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanRecord.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class AppRepaymentPlanRecord implements Vo { + + @ApiModelProperty("月份期数") + private String date; + @ApiModelProperty("合计") + private String total; + @ApiModelProperty("月还") + private String yh; + @ApiModelProperty("其他融") + private String qtr; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanThead.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanThead.java new file mode 100644 index 0000000000..1ff395c0ae --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanThead.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class AppRepaymentPlanThead implements Vo { + + private String name; + private String label; + private Boolean fixed = false; + private String width; + private String emptyString; + private String align; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index fc635f37e6..623be62dfa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.riskcenter.api.loanrepaymentschedule; -import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForRepayQuery; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.common.core.query.PagerQuery; @@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -129,4 +127,14 @@ public interface LoanRepaymentScheduleFeign { @PostMapping("/getRepaymentPlanListWx") @ResponseBody ResultBean> getRepaymentPlanListWx(PagerQuery pagerQuery); + + @ApiOperation("微信小程序查看单车还款计划表") + @GetMapping("/getRepaymentPlanListByVinNoWx") + @ResponseBody + public ResultBean getRepaymentPlanListByVinNoWx(@RequestParam("vinNo") String vinNo, @RequestParam("scheduleSid") String scheduleSid); + + @ApiOperation("微信小程序查看单车还款记录") + @GetMapping("/getRepaymentHistoryListByVinNoWx") + @ResponseBody + public ResultBean getRepaymentHistoryListByVinNoWx(@RequestParam("vinNo") String vinNo, @RequestParam("scheduleSid") String scheduleSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index ca2739cae9..4e7ffc0ce0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -107,4 +107,14 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule public ResultBean> getRepaymentPlanListWx(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + return null; + } + + @Override + public ResultBean getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index b9c8bb76ee..b6cc55eb3e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -10,6 +10,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RecordCountVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RepaymentDetailsExportVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.TransferedPaymentExportVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentHistoryRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -83,4 +84,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper selUpdateTimeByBankName(@Param("histories") List histories); void saveList(@Param("list") List list); + + List selSchSidAndVinNo(@Param("scheduleSid") String scheduleSid,@Param("vinNo") String vinNo); } 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 6b1c8aa18b..8b5898ad3e 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 @@ -897,5 +897,19 @@ - + 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 d7193931fc..6232f9b1ba 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 @@ -49,6 +49,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.CheckPayStateVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentHistoryRecord; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; @@ -2190,4 +2191,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService histories) { baseMapper.saveList(histories); } + + public List selSchSidAndVinNo(String scheduleSid, String vinNo) { + return baseMapper.selSchSidAndVinNo(scheduleSid,vinNo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index f5bdaa79df..3ce498e7ba 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.DifferenceVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.HistoryOverDueVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.*; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -94,4 +95,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper list); void saveList(@Param("list") List list); + + List selByMainSidAndVinNo(@Param("scheduleSid") String scheduleSid, @Param("vinNo") String vinNo); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index 6f99f3fbe2..e7f05de1e2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -851,4 +851,54 @@ and policyOrOther = #{s} order by period asc + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 7578a91cea..34386d8ce4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -347,4 +347,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService planDetails) { baseMapper.saveList(planDetails); } + + public List selByMainSidAndVinNo(String scheduleSid, String vinNo) { + return baseMapper.selByMainSidAndVinNo(scheduleSid, vinNo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index c62a782a18..415594b7eb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java @@ -127,4 +127,18 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { PagerVo page = loanRepaymentScheduleService.getRepaymentPlanListWx(pq); return rb.success().setData(page); } + + @Override + public ResultBean getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + ResultBean rb = ResultBean.fireFail(); + AppRepaymentPlanListDetailsWxVo repaymentPlanListByVinNoWx = loanRepaymentScheduleService.getRepaymentPlanListByVinNoWx(vinNo, scheduleSid); + return rb.success().setData(repaymentPlanListByVinNoWx); + } + + @Override + public ResultBean getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + ResultBean rb = ResultBean.fireFail(); + AppRepaymentHistoryListDetailsWxVo repaymentHistoryListByVinNoWx = loanRepaymentScheduleService.getRepaymentHistoryListByVinNoWx(vinNo,scheduleSid); + return rb.success().setData(repaymentHistoryListByVinNoWx); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 0c6f178c89..3d04d484d4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -1,7 +1,6 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentschedule; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -30,7 +29,6 @@ import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -71,23 +69,21 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.PushMessageQuery; import com.yxt.messagecenter.api.message.PushSmsDto; +import org.apache.commons.lang3.time.DateUtils; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.tomcat.util.threads.ThreadPoolExecutor; -import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; @@ -119,8 +115,6 @@ public class LoanRepaymentScheduleService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public AppRepaymentPlanListDetailsWxVo getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + AppRepaymentPlanListDetailsWxVo appRepaymentPlanListDetailsWxVo = new AppRepaymentPlanListDetailsWxVo(); + List appRepaymentPlanTheads = new ArrayList<>(); + LoanRepaymentSchedule loanRepaymentSchedule = fetchBySid(scheduleSid); + appRepaymentPlanListDetailsWxVo.setContractId(loanRepaymentSchedule.getLoanContractNo()); + appRepaymentPlanListDetailsWxVo.setLenderName(loanRepaymentSchedule.getBorrowerName()); + appRepaymentPlanListDetailsWxVo.setSalesName(loanRepaymentSchedule.getStaffName()); + appRepaymentPlanListDetailsWxVo.setManagement(loanRepaymentSchedule.getBankName()); + appRepaymentPlanListDetailsWxVo.setZcpDate(loanRepaymentSchedule.getMainPeriod() + "/" + loanRepaymentSchedule.getMainRepayDate() + "(首还)"); + if ("1".equals(loanRepaymentSchedule.getIsOtherPolicy())){//有其他融 + appRepaymentPlanListDetailsWxVo.setPtrDate(loanRepaymentSchedule.getOtherPeriod() + "/" + loanRepaymentSchedule.getOtherRepayDate() + "(首还)"); + if ("1".equals(loanRepaymentSchedule.getSameBank())){//其他融资方与主产品相同 + appRepaymentPlanListDetailsWxVo.setOtherManagement(appRepaymentPlanListDetailsWxVo.getManagement()); + }else {//其他融资方与主产品不相同 + List loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selByMainSidAndPolicyOrOther(scheduleSid, "1"); + appRepaymentPlanListDetailsWxVo.setOtherManagement(loanRepaymentPlanDetails.get(0).getBankName()); + } + AppRepaymentPlanThead appRepaymentPlanThead4 = new AppRepaymentPlanThead(); + appRepaymentPlanThead4.setName("qtr"); + String[] qtrDate = loanRepaymentSchedule.getOtherRepayDate().toString().split("-"); + appRepaymentPlanThead4.setLabel("其他融(" + qtrDate[qtrDate.length - 1] + "日)"); + appRepaymentPlanThead4.setWidth("100"); + appRepaymentPlanThead4.setEmptyString("-"); + appRepaymentPlanThead4.setAlign("center"); + appRepaymentPlanTheads.add(appRepaymentPlanThead4); + } + appRepaymentPlanListDetailsWxVo.setVinNo(vinNo); + AppRepaymentPlanThead appRepaymentPlanThead1 = new AppRepaymentPlanThead(); + appRepaymentPlanThead1.setName("date"); + appRepaymentPlanThead1.setLabel("月份(期数)"); + appRepaymentPlanThead1.setFixed(true); + appRepaymentPlanThead1.setWidth("120"); + appRepaymentPlanThead1.setEmptyString("-"); + appRepaymentPlanThead1.setAlign("center"); + appRepaymentPlanTheads.add(appRepaymentPlanThead1); + AppRepaymentPlanThead appRepaymentPlanThead2 = new AppRepaymentPlanThead(); + appRepaymentPlanThead2.setName("total"); + appRepaymentPlanThead2.setLabel("合计"); + appRepaymentPlanThead2.setWidth("100"); + appRepaymentPlanThead2.setEmptyString("-"); + appRepaymentPlanThead2.setAlign("center"); + appRepaymentPlanTheads.add(appRepaymentPlanThead2); + AppRepaymentPlanThead appRepaymentPlanThead3 = new AppRepaymentPlanThead(); + appRepaymentPlanThead3.setName("yh"); + String[] zcpDate = loanRepaymentSchedule.getMainRepayDate().toString().split("-"); + appRepaymentPlanThead3.setLabel("月还(" + zcpDate[zcpDate.length - 1] + "日)"); + appRepaymentPlanThead3.setWidth("100"); + appRepaymentPlanThead3.setEmptyString("-"); + appRepaymentPlanThead3.setAlign("center"); + appRepaymentPlanTheads.add(appRepaymentPlanThead3); + appRepaymentPlanListDetailsWxVo.setThead(appRepaymentPlanTheads); + List appRepaymentPlanRecords = loanRepaymentPlanDetailsService.selByMainSidAndVinNo(scheduleSid, vinNo); + appRepaymentPlanListDetailsWxVo.setRecord(appRepaymentPlanRecords); + return appRepaymentPlanListDetailsWxVo; + } + + public AppRepaymentHistoryListDetailsWxVo getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + AppRepaymentHistoryListDetailsWxVo appRepaymentHistoryListDetailsWxVo = new AppRepaymentHistoryListDetailsWxVo(); + List appRepaymentHistoryTheads = new ArrayList<>(); + appRepaymentHistoryListDetailsWxVo.setVinNo(vinNo); + AppRepaymentHistoryThead appRepaymentHistoryThead1 = new AppRepaymentHistoryThead(); + appRepaymentHistoryThead1.setName("period"); + appRepaymentHistoryThead1.setLabel("期数"); + appRepaymentHistoryThead1.setFixed(true); + appRepaymentHistoryThead1.setWidth("100"); + appRepaymentHistoryThead1.setEmptyString("-"); + appRepaymentHistoryThead1.setAlign("center"); + appRepaymentHistoryTheads.add(appRepaymentHistoryThead1); + AppRepaymentHistoryThead appRepaymentHistoryThead2 = new AppRepaymentHistoryThead(); + appRepaymentHistoryThead2.setName("kxType"); + appRepaymentHistoryThead2.setLabel("款项类别"); + appRepaymentHistoryThead2.setWidth("80"); + appRepaymentHistoryThead2.setEmptyString("-"); + appRepaymentHistoryThead2.setAlign("center"); + appRepaymentHistoryTheads.add(appRepaymentHistoryThead2); + AppRepaymentHistoryThead appRepaymentHistoryThead3 = new AppRepaymentHistoryThead(); + appRepaymentHistoryThead3.setName("actualDate"); + appRepaymentHistoryThead3.setLabel("实还日期"); + appRepaymentHistoryThead3.setWidth("80"); + appRepaymentHistoryThead3.setEmptyString("-"); + appRepaymentHistoryThead3.setAlign("center"); + appRepaymentHistoryTheads.add(appRepaymentHistoryThead3); + AppRepaymentHistoryThead appRepaymentHistoryThead4 = new AppRepaymentHistoryThead(); + appRepaymentHistoryThead4.setName("actualMoney"); + appRepaymentHistoryThead4.setLabel("实还金额"); + appRepaymentHistoryThead4.setWidth("80"); + appRepaymentHistoryThead4.setEmptyString("-"); + appRepaymentHistoryThead4.setAlign("center"); + appRepaymentHistoryTheads.add(appRepaymentHistoryThead4); + AppRepaymentHistoryThead appRepaymentHistoryThead5 = new AppRepaymentHistoryThead(); + appRepaymentHistoryThead5.setName("returnWay"); + appRepaymentHistoryThead5.setLabel("还款方式"); + appRepaymentHistoryThead5.setWidth("80"); + appRepaymentHistoryThead5.setEmptyString("-"); + appRepaymentHistoryThead5.setAlign("center"); + appRepaymentHistoryTheads.add(appRepaymentHistoryThead5); + appRepaymentHistoryListDetailsWxVo.setThead(appRepaymentHistoryTheads); + List appRepaymentHistoryRecords = loanRepaymentHistoryService.selSchSidAndVinNo(scheduleSid,vinNo); + appRepaymentHistoryListDetailsWxVo.setRecord(appRepaymentHistoryRecords); + return appRepaymentHistoryListDetailsWxVo; + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java new file mode 100644 index 0000000000..82d17b0d61 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/9/11 14:26 + */ +@Data +public class RepaymentHistoryListDetailsWxVo implements Vo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("标题") + private List thead; + @ApiModelProperty("表格") + private List record; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryRecord.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryRecord.java new file mode 100644 index 0000000000..28356584f3 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryRecord.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentHistoryRecord implements Vo { + + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("款项类别") + private String kxType; + @ApiModelProperty("实还日期") + private String actualDate; + @ApiModelProperty("实还金额") + private String actualMoney; + @ApiModelProperty("还款方式") + private String returnWay; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryThead.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryThead.java new file mode 100644 index 0000000000..73e7a70008 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryThead.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentHistoryThead implements Vo { + + private String name; + private String label; + private Boolean fixed = false; + private String width; + private String emptyString; + private String align; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java index 7f337ef0b2..d6b025a144 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java @@ -29,11 +29,6 @@ public interface RepaymentPlanFeign { @ResponseBody public ResultBean> getRepaymentPlanList(@RequestBody PagerQuery pq); - @ApiOperation("微信小程序还款计划列表") - @PostMapping("/getRepaymentPlanListWx") - @ResponseBody - public ResultBean> getRepaymentPlanListWx(@RequestBody PagerQuery pq); - @ApiOperation("查看还款计划表") @GetMapping("/getRepaymentPlanListBySid") @ResponseBody @@ -44,5 +39,21 @@ public interface RepaymentPlanFeign { @ResponseBody public ResultBean> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid); + /********************************************************微信小程序*****************************************************/ + + @ApiOperation("微信小程序还款计划列表") + @PostMapping("/getRepaymentPlanListWx") + @ResponseBody + public ResultBean> getRepaymentPlanListWx(@RequestBody PagerQuery pq); + + @ApiOperation("微信小程序查看单车还款计划表") + @GetMapping("/getRepaymentPlanListByVinNoWx") + @ResponseBody + public ResultBean getRepaymentPlanListByVinNoWx(@RequestParam("vinNo") String vinNo,@RequestParam("scheduleSid") String scheduleSid); + + @ApiOperation("微信小程序查看单车还款记录") + @GetMapping("/getRepaymentHistoryListByVinNoWx") + @ResponseBody + public ResultBean getRepaymentHistoryListByVinNoWx(@RequestParam("vinNo") String vinNo,@RequestParam("scheduleSid") String scheduleSid); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java index def09b0c0b..d9ce3acf42 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java @@ -27,6 +27,16 @@ public class RepaymentPlanFeignFallback implements RepaymentPlanFeign { return null; } + @Override + public ResultBean getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + return null; + } + + @Override + public ResultBean getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + return null; + } + @Override public ResultBean getRepaymentPlanListBySid(String sid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java new file mode 100644 index 0000000000..b1f51de958 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/9/11 14:26 + */ +@Data +public class RepaymentPlanListDetailsWxVo implements Vo { + + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("贷款人名称") + private String lenderName; + @ApiModelProperty("销售专员") + private String salesName; + @ApiModelProperty("主产品资方") + private String management; + @ApiModelProperty("主产品期数/还款日") + private String zcpDate; + @ApiModelProperty("其他融资方") + private String otherManagement; + @ApiModelProperty("其他融期数/还款日") + private String ptrDate; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("下载路径") + private String downloadUrl; + @ApiModelProperty("标题") + private List thead; + @ApiModelProperty("表格") + private List record; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanRecord.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanRecord.java new file mode 100644 index 0000000000..a6c4c25fec --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanRecord.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentPlanRecord implements Vo { + + @ApiModelProperty("月份期数") + private String date; + @ApiModelProperty("合计") + private String total; + @ApiModelProperty("月还") + private String yh; + @ApiModelProperty("其他融") + private String qtr; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanThead.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanThead.java new file mode 100644 index 0000000000..d65b9dd719 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanThead.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentPlanThead implements Vo { + + private String name; + private String label; + private Boolean fixed = false; + private String width; + private String emptyString; + private String align; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java index e84329b4a7..36d1ecb6b9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java @@ -36,6 +36,16 @@ public class RepaymentPlanRest implements RepaymentPlanFeign { return repaymentPlanService.getRepaymentPlanListWx(pq); } + @Override + public ResultBean getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + return repaymentPlanService.getRepaymentPlanListByVinNoWx(vinNo,scheduleSid); + } + + @Override + public ResultBean getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + return repaymentPlanService.getRepaymentHistoryListByVinNoWx(vinNo,scheduleSid); + } + @Override public ResultBean getRepaymentPlanListBySid(String sid) { return repaymentPlanService.getRepaymentPlanListBySid(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java index d5f994c24d..53849cedc0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java @@ -94,4 +94,20 @@ public class RepaymentPlanService { } return rb.success().setData(pagerVo); } + + public ResultBean getRepaymentPlanListByVinNoWx(String vinNo, String scheduleSid) { + ResultBean rb = ResultBean.fireFail(); + AppRepaymentPlanListDetailsWxVo appRepaymentPlanListDetailsWxVo = loanRepaymentScheduleFeign.getRepaymentPlanListByVinNoWx(vinNo, scheduleSid).getData(); + RepaymentPlanListDetailsWxVo repaymentPlanListDetailsWxVo = new RepaymentPlanListDetailsWxVo(); + BeanUtil.copyProperties(appRepaymentPlanListDetailsWxVo,repaymentPlanListDetailsWxVo); + return rb.success().setData(repaymentPlanListDetailsWxVo); + } + + public ResultBean getRepaymentHistoryListByVinNoWx(String vinNo, String scheduleSid) { + ResultBean rb = ResultBean.fireFail(); + AppRepaymentHistoryListDetailsWxVo appRepaymentHistoryListDetailsWxVo = loanRepaymentScheduleFeign.getRepaymentHistoryListByVinNoWx(vinNo, scheduleSid).getData(); + RepaymentHistoryListDetailsWxVo repaymentHistoryListDetailsWxVo = new RepaymentHistoryListDetailsWxVo(); + BeanUtil.copyProperties(appRepaymentHistoryListDetailsWxVo,repaymentHistoryListDetailsWxVo); + return rb.success().setData(repaymentHistoryListDetailsWxVo); + } }