From 64f15ea93d33d46cf815dadffe5241051427048d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 4 Sep 2023 18:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/commoncontract/PrintConfirmDto.java | 2 + .../commoncontract/CommonContractService.java | 12 +++ .../loantemplate/AppLoanTemplateInfoVo.java | 78 ++++++++++++++++ .../loantemplate/AppLoanTemplateQuery.java | 23 +++++ .../api/loantemplate/AppLoanTemplateVo.java | 26 ++++++ .../api/loantemplate/LoanTemplateFeign.java | 9 ++ .../biz/loantemplate/LoanTemplateMapper.java | 3 + .../biz/loantemplate/LoanTemplateMapper.xml | 20 +++++ .../biz/loantemplate/LoanTemplateRest.java | 13 +++ .../biz/loantemplate/LoanTemplateService.java | 61 +++++++++++++ .../financialPolicy/FinancialPolicyFeign.java | 10 +++ .../financialPolicy/ProductPolicyInfo.java | 90 +++++++++++++++++++ .../financialPolicy/ProductPolicyQuery.java | 21 +++++ .../financialPolicy/ProductPolicyVo.java | 25 ++++++ .../financialPolicy/FinancialPolicyRest.java | 15 +++- .../FinancialPolicyService.java | 33 ++++++- 16 files changed, 434 insertions(+), 7 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateInfoVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyInfo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java index e7d87271e5..0314497ad1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java @@ -47,4 +47,6 @@ public class PrintConfirmDto implements Dto { @ApiModelProperty("甲方主体") private String createOrgName; + @ApiModelProperty("预估报价方案") + private String revalencySchemeKey; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 43261440e0..a60172c0b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -72,6 +72,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; @@ -196,6 +198,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { @@ -1143,6 +1147,14 @@ public class CommonContractService extends MybatisBaseService resultBean = loanTemplateFeign.templateQuotationCreatePdf(loanTemplateQuotationQuery); + return resultBean.getData(); + } + /** * 生成 客户开票申请书 pdf * diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateInfoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateInfoVo.java new file mode 100644 index 0000000000..8bd66e8123 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateInfoVo.java @@ -0,0 +1,78 @@ +package com.yxt.anrui.riskcenter.api.loantemplate; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class AppLoanTemplateInfoVo { + + @ApiModelProperty("政策名称") + private String policyName; + + @ApiModelProperty("预计应收合计") + private String receivableTotal; + + + @ApiModelProperty("车型名称") + private String vehModel; + + @ApiModelProperty("车型sid") + private String vehModelSid; + + @ApiModelProperty("配置sid") + private String vehModelConfigSid; + + @ApiModelProperty("融资项目") + private String mainVehicleAmount; + + @ApiModelProperty("融资项目首付") + private String loanDownPay; + + @ApiModelProperty("贷款保证金") + private String bondAmounts; + + @ApiModelProperty("服务费") + private String serviceAmount; + + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + + @ApiModelProperty("落户保证金") + private String depositSettle; + + @ApiModelProperty("补车价") + private String vehOtherPrice; + + @ApiModelProperty("代收购置税") + private String proxyPurchasetax; + + @ApiModelProperty("保险保证金") + private String depositPremium; + + @ApiModelProperty("其他费用") + private String otherAmount; + + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + + @ApiModelProperty("总期数") + private String loanPeriod; + + @ApiModelProperty("前X期数") + private String times; + @ApiModelProperty("前X期数月还") + private String previousRepay; + @ApiModelProperty("剩余期数月还") + private String monthlyRepay; + + @ApiModelProperty("预计首期还款日") + private String returnTime; + + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateQuery.java new file mode 100644 index 0000000000..748853db94 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loantemplate; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class AppLoanTemplateQuery implements Query { + private static final long serialVersionUID = -4947693491448930731L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("机构全组织机构") + private String orgPath; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java new file mode 100644 index 0000000000..e9eef166f7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/AppLoanTemplateVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loantemplate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class AppLoanTemplateVo implements Vo { + private static final long serialVersionUID = -2494992540171473915L; + + @ApiModelProperty("模板名称") + private String templateName; + @ApiModelProperty("单台指导价") + private String vehPrice; + @ApiModelProperty("备案日期") + private String filingDate; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("方案1-4，0-3") + private int plan; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateFeign.java index fd30f4ab84..368dffacf5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateFeign.java @@ -1,5 +1,7 @@ package com.yxt.anrui.riskcenter.api.loantemplate; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.*; import com.yxt.common.core.query.PagerQuery; @@ -89,5 +91,12 @@ public interface LoanTemplateFeign { @PostMapping("/templateQuotationCreatePdf") ResultBean templateQuotationCreatePdf(@RequestBody LoanTemplateQuotationQuery query); + @ApiOperation("app金融产品公司定制") + @PostMapping("getCustomizedList") + ResultBean> getCustomizedList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("app金融产品公司定制详情") + @GetMapping("getCustomizedInfo") + ResultBean getCustomizedInfo(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.java index 1d53c17946..4bf79f0958 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +24,6 @@ public interface LoanTemplateMapper extends BaseMapper { int updateFlowFiled(Map map); int selectBySid(String join); + + IPage getCustomizedList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml index cba7f8bdd1..be635ea8ff 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml @@ -54,4 +54,24 @@ where length(nodeState) > 0 and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateRest.java index 4b8ef6c779..14c16a5fd2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loantemplate; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loantemplate.*; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.*; import com.yxt.common.core.query.PagerQuery; @@ -106,4 +107,16 @@ public class LoanTemplateRest implements LoanTemplateFeign { public ResultBean templateQuotationCreatePdf(LoanTemplateQuotationQuery query) { return loanTemplateService.templateQuotationCreatePdf(query); } + + @Override + public ResultBean> getCustomizedList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanTemplateService.getCustomizedList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean getCustomizedInfo(String sid) { + return loanTemplateService.getCustomizedInfo(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java index a733ef6272..3e7b9b92c3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java @@ -24,9 +24,12 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto; @@ -999,4 +1002,62 @@ public class LoanTemplateService extends MybatisBaseService getCustomizedList(PagerQuery pagerQuery) { + AppLoanTemplateQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + qw.eq("lfp.orgSidPath", query.getOrgPath()); + qw.eq("lfp.nodeState", "已办结"); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getCustomizedList(page, qw, query.getName()); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + + } + + public ResultBean getCustomizedInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppLoanTemplateInfoVo appLoanTemplateInfoVo = new AppLoanTemplateInfoVo(); + LoanTemplate loanTemplate = fetchBySid(sid); + LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(sid); + BeanUtil.copyProperties(loanTemplate, appLoanTemplateInfoVo); + BeanUtil.copyProperties(loanSolutions, appLoanTemplateInfoVo); + LoanSolutionsOtherpolicy otherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid()); + if (otherpolicy != null) { + //----------前X期月还/剩余月还------------- + if (StringUtils.isNotBlank(otherpolicy.getPeriod())) { + String period = otherpolicy.getPeriod(); + String[] split = period.split("/"); + String beforePeriod = split[0]; + String afterPeriod = split[1]; + if (beforePeriod.equals("0") && !afterPeriod.equals("0")) { + appLoanTemplateInfoVo.setTimes(afterPeriod); + appLoanTemplateInfoVo.setPreviousRepay(otherpolicy.getMonthlyRepay()); + } else if (!beforePeriod.equals("0") && afterPeriod.equals("0")) { + String monthlyRepay = otherpolicy.getMonthlyRepay(); + appLoanTemplateInfoVo.setTimes(beforePeriod); + String[] splitMonthlyPepay = monthlyRepay.split("/"); + String beforeMoney = splitMonthlyPepay[0]; + appLoanTemplateInfoVo.setPreviousRepay(beforeMoney); + } else { + String monthlyRepay = otherpolicy.getMonthlyRepay(); + appLoanTemplateInfoVo.setTimes(beforePeriod); + String[] splitMonthlyPepay = monthlyRepay.split("/"); + String beforeMoney = splitMonthlyPepay[0]; + String afterMoney = splitMonthlyPepay[1]; + appLoanTemplateInfoVo.setPreviousRepay(beforeMoney); + appLoanTemplateInfoVo.setMonthlyRepay(afterMoney); + } + } + //----------预计首期还款日------------- + if (StringUtils.isNotBlank(otherpolicy.getReturnTime())) { + appLoanTemplateInfoVo.setReturnTime(otherpolicy.getReturnTime()); + } + } + LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid()); + BeanUtil.copyProperties(loanSolutionsDetail, appLoanTemplateInfoVo); + return rb.success().setData(appLoanTemplateInfoVo); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java index 30d88086b7..bd85fa9be4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java @@ -32,4 +32,14 @@ public interface FinancialPolicyFeign { @GetMapping("getProductInfo") ResultBean getProductInfo(@RequestParam("sid") String sid); + + @ApiOperation("app金融产品公司定制") + @PostMapping("getCustomizedList") + ResultBean> getCustomizedList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("app金融产品公司定制详情") + @GetMapping("getCustomizedInfo") + ResultBean getCustomizedInfo(@RequestParam("sid") String sid); + + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyInfo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyInfo.java new file mode 100644 index 0000000000..e25feceb62 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyInfo.java @@ -0,0 +1,90 @@ +package com.yxt.anrui.terminal.api.autoservice.financialPolicy; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class ProductPolicyInfo { + + @ApiModelProperty("政策名称") + private String policyName; + + @ApiModelProperty("预计应收合计") + private String receivableTotal; + + + @ApiModelProperty("车型名称") + @JsonProperty("model") + private String vehModel; + + @ApiModelProperty("车型sid") + @JsonProperty("modelSid") + private String vehModelSid; + + @ApiModelProperty("配置sid") + @JsonProperty("configSid") + private String vehModelConfigSid; + + @ApiModelProperty("融资项目") + @JsonProperty("loanItems") + private String mainVehicleAmount; + + @ApiModelProperty("融资项目首付") + private String loanDownPay; + + @ApiModelProperty("贷款保证金") + @JsonProperty("premium") + private String bondAmounts; + + @ApiModelProperty("服务费") + private String serviceAmount; + + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + + @ApiModelProperty("落户保证金") + private String depositSettle; + + @ApiModelProperty("补车价") + private String vehOtherPrice; + + @ApiModelProperty("代收购置税") + private String proxyPurchasetax; + + @ApiModelProperty("保险保证金") + private String depositPremium; + + @ApiModelProperty("其他费用") + private String otherAmount; + + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + + @ApiModelProperty("总期数") + @JsonProperty("period") + private String loanPeriod; + + @ApiModelProperty("前几期") + @JsonProperty("monthlyRepay") + private String times; + + @ApiModelProperty("前几期月还多少") + @JsonProperty("monthlyRepay2") + private String previousRepay; + + @ApiModelProperty("剩余期数月还多少") + @JsonProperty("loanMonthlyRepay") + private String monthlyRepay; + + @ApiModelProperty("预计首期还款日") + private String returnTime; + + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyQuery.java new file mode 100644 index 0000000000..3e3d785515 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.autoservice.financialPolicy; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class ProductPolicyQuery implements Query { + private static final long serialVersionUID = 2053880525747413838L; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("机构全组织机构") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java new file mode 100644 index 0000000000..d2c0d8ab0e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/ProductPolicyVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.financialPolicy; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/4 + **/ +@Data +public class ProductPolicyVo implements Vo { + private static final long serialVersionUID = 6097174381344736207L; + @ApiModelProperty("模板名称") + private String templateName; + @ApiModelProperty("单台指导价") + private String vehPrice; + @ApiModelProperty("备案日期") + private String filingDate; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("方案1-4，0-3") + private int plan; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java index efe2de75a4..f443b21335 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.terminal.biz.autoservice.financialPolicy; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyFeign; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo; +import com.yxt.anrui.terminal.api.autoservice.financialPolicy.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -32,4 +29,14 @@ public class FinancialPolicyRest implements FinancialPolicyFeign { public ResultBean getProductInfo(String sid) { return financialPolicyService.getProductInfo(sid); } + + @Override + public ResultBean> getCustomizedList(PagerQuery pagerQuery) { + return financialPolicyService.getCustomizedList(pagerQuery); + } + + @Override + public ResultBean getCustomizedInfo(String sid) { + return financialPolicyService.getCustomizedInfo(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java index 0b5ce1f26a..f39fceb95b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java @@ -6,9 +6,11 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery; import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery; -import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo; +import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateInfoVo; +import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateQuery; +import com.yxt.anrui.riskcenter.api.loantemplate.AppLoanTemplateVo; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; +import com.yxt.anrui.terminal.api.autoservice.financialPolicy.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -31,6 +33,8 @@ public class FinancialPolicyService { @Autowired private LoanFinPolicyFeign loanFinPolicyFeign; + @Autowired + private LoanTemplateFeign loanTemplateFeign; public ResultBean> getProductList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -54,4 +58,27 @@ public class FinancialPolicyService { BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo); return rb.success().setData(financialPolicyDetailsVo); } + + public ResultBean> getCustomizedList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = loanTemplateFeign.getCustomizedList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ProductPolicyVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } + + public ResultBean getCustomizedInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + ProductPolicyInfo financialPolicyDetailsVo = new ProductPolicyInfo(); + ResultBean resultBean = loanTemplateFeign.getCustomizedInfo(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppLoanTemplateInfoVo appPolicyDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo); + return rb.success().setData(financialPolicyDetailsVo); + } }