From a3f31f31deaf4e1c92600f9228ec5f89e2339dce Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 12 Jul 2023 11:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 33 ++++++++++- .../anrui/flowable/biz/flow/FlowableRest.java | 14 +++-- .../loanfinotherPolicy/AppOtherPolicyVo.java | 28 +++++++++ .../api/loanfinpolicy/AppPolicyDetailsVo.java | 17 +++++- .../api/loanfinpolicy/LoanFinPolicyFeign.java | 4 +- .../LoanFinOtherPolicyMapper.java | 3 + .../LoanFinOtherPolicyMapper.xml | 6 ++ .../LoanFinOtherPolicyService.java | 5 ++ .../loanfinpolicy/LoanFinPolicyMapper.java | 3 + .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 26 ++++++++ .../biz/loanfinpolicy/LoanFinPolicyRest.java | 5 +- .../loanfinpolicy/LoanFinPolicyService.java | 23 ++++++++ .../FinancialOtherPolicyVo.java | 31 ++++++++++ .../FinancialPolicyDetailsVo.java | 59 +++++++++++++++++++ .../financialPolicy/FinancialPolicyFeign.java | 6 ++ .../financialPolicy/FinancialPolicyRest.java | 6 ++ .../FinancialPolicyService.java | 15 ++++- 17 files changed, 268 insertions(+), 16 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index feba768e52..caf7535667 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5452,7 +5452,36 @@ public class BusSalesOrderService extends MybatisBaseService vinListVos = new ArrayList<>(); - //根据销售订单查询现车 + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid(saleOrderSid); + busSalesOrderVehicleList.removeAll(Collections.singleton(null)); + if (!busSalesOrderVehicleList.isEmpty()) { + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + VinListVo vinListVo = new VinListVo(); + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + //根据车架号查询是否已出库 + ResultBean baseVehicleResultBean = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()); + if (baseVehicleResultBean.getSuccess()) { + BaseVehicleSelectVo vo = baseVehicleResultBean.getData(); + if (vo != null) { + if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) { + vinListVo.setState(true); + } else { + vinListVo.setState(false); + } + } + } + } + vinListVos.add(vinListVo); + } + } + /* //根据销售订单查询现车 List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); nowCarList.removeAll(Collections.singleton(null)); AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); @@ -5492,7 +5521,7 @@ public class BusSalesOrderService extends MybatisBaseService sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if (sysFlowableConfigVvoResultBean.getData() != null) { + if (sysFlowableConfigVvoResultBean.getData() != null) {//若下一环节有转办人且不过期，则isChange为true if (StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())) { //转办人sid nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); @@ -466,12 +466,12 @@ public class FlowableRest implements FlowableFeign { taskService.addComment(taskId, instanceId, FlowComment.DELEGATE.getType(), comment); taskService.resolveTask(taskId, formVariables); - } else { + } else {//当前环节办理通过，且将下一环节用户放入流程中 taskService.addComment(taskId, instanceId, FlowComment.NORMAL.getType(), comment); log.error("taskid:{}，userSid:{}", taskId, userSid); log.error("formVariables:{}", JSON.toJSONString(formVariables)); taskService.setAssignee(taskId, userSid); - taskService.complete(taskId, formVariables); + taskService.complete(taskId, formVariables);//当前用户办理通过 //根据流程实例的id取最新的待办环节，给环节设置上用户sid ResultBean> ll = flowtaskService.getLatestTasksNew(instanceId); if (ll.getData().size() > 0) { @@ -486,7 +486,7 @@ public class FlowableRest implements FlowableFeign { processCommentDto.setProcessId(dto.getInstanceId()); processCommentService.saveOrUpdateDto(processCommentDto); } - taskService.setAssignee(id_, nextUserSid); + taskService.setAssignee(id_, nextUserSid);//将下一环节用户放入流程中 vo.setTaskId(id_); //在act_ru_variable表中增加环节上的业务参数的变量 taskService.setVariablesLocal(id_, formVariables); @@ -507,14 +507,16 @@ public class FlowableRest implements FlowableFeign { } List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), dto.getFormVariables()); - boolean contains = false; + boolean contains = false;//环节人是否自动审批 for (int i = 0; i < flowElements.size(); i++) { FlowElement flowElement = flowElements.get(i); String id = flowElement.getId(); if (taskDefKey.equals(id) && i + 1 < flowElements.size()) { + //获取下下一环节 FlowElement flowElement1 = flowElements.get(i + 1); List sysUserVoLists2 = new ArrayList<>(); if (i + 2 < flowElements.size()) { + //获取下下下一环节用户 FlowElement flowElement2 = flowElements.get(i + 2); if (flowElement2 instanceof UserTask) { UserTask userTask = (UserTask) flowElement2; @@ -569,7 +571,7 @@ public class FlowableRest implements FlowableFeign { contains = true; break; } - //如果下一环节无用户，则默认系统管理员自动审批 + //如果下下一环节无用户，下下下一环节用户与下一环节用户相同且只有一个，则下一环节用户自动审批。 if (sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)) { contains = true; break; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java new file mode 100644 index 0000000000..85e02ab96a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/12 + **/ +@Data +public class AppOtherPolicyVo { + + @ApiModelProperty("产品类别") + private String productTypeValue; + + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("年利率（%）") + private String yearRatio; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java index 51641dce3d..e7d05ef51a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanfinpolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,6 +18,7 @@ public class AppPolicyDetailsVo implements Vo { private String policyName; @ApiModelProperty("适用部门，黑龙江销售部或分公司") private String useDeptNames; + private String useOrgName; @ApiModelProperty("资方简称") private String bankShortName; @ApiModelProperty("业务类型") @@ -37,14 +39,25 @@ public class AppPolicyDetailsVo implements Vo { private String downPayRatioLeast; @ApiModelProperty("首付比例") private String downPayRatio; -/* @ApiModelProperty("保证金比例") + @ApiModelProperty("保证金比例") + private String bondRatio; @ApiModelProperty("期数") + private String period; @ApiModelProperty("标准年利率") + private String yearRatio; @ApiModelProperty("服务费类型") + private String serviceAmountTypeValue; @ApiModelProperty("服务费") + private String serviceAmount; @ApiModelProperty("保险保证金") + private String depositPremium; @ApiModelProperty("落户保证金") + private String depositSettle; @ApiModelProperty("名义/留购价款") + private String nominalPrice; @ApiModelProperty("有效期至") - @ApiModelProperty("其他融")*/ + private String validDateTo; + private int isOtherProduct; + @ApiModelProperty("其他融") + private AppOtherPolicyVo otherInfo; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index e1d667a5f9..075078f15e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -50,6 +50,6 @@ public interface LoanFinPolicyFeign { ResultBean> getProductList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品常规详情") - @GetMapping("appDetails") - ResultBean appDetails(@RequestParam("sid") String sid); + @GetMapping("getProductInfo") + ResultBean getProductInfo(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 8d6acac3db..0130e30359 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import org.apache.ibatis.annotations.Mapper; @@ -21,4 +22,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper LoanFinOtherPolicy selectByMainSid(String sid); LoanFinOtherPolicyVos details(String sid); + + AppOtherPolicyVo selectByMainSids(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index 8cf8cd214f..6a5b71bdb6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -28,4 +28,10 @@ from loan_fin_otherpolicy where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index bd1fb0f3f6..3a0dde1201 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import com.yxt.common.base.service.MybatisBaseService; @@ -40,4 +41,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService { List selectByBankSid(String sid); IPage getProductList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + AppPolicyDetailsVo getProductInfo(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 73671d3e7d..6b3e9ff656 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -58,4 +58,30 @@ order by lfp.id desc + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index a9bbaf4959..d5c428e178 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java @@ -62,8 +62,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign { } @Override - public ResultBean appDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - return null; + public ResultBean getProductInfo(String sid) { + return loanFinPolicyService.getProductInfo(sid); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 649d7512e5..920ffd322c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -8,6 +8,7 @@ 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.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyDto; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVo; @@ -406,4 +407,26 @@ public class LoanFinPolicyService extends MybatisBaseService getProductInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppPolicyDetailsVo appPolicyDetailsVo = baseMapper.getProductInfo(sid); + if (StringUtils.isBlank(appPolicyDetailsVo.getUseDeptNames())) { + appPolicyDetailsVo.setUseDeptNames(appPolicyDetailsVo.getUseOrgName()); + } + if (StringUtils.isNotBlank(appPolicyDetailsVo.getGuaranteeTypeKey())) { + if ("01".equals(appPolicyDetailsVo.getGuaranteeTypeKey())) { + appPolicyDetailsVo.setIsGuarantee("1"); + } else { + appPolicyDetailsVo.setIsGuarantee("0"); + } + } + if (appPolicyDetailsVo.getIsOtherProduct() == 1) {//有其他融 + AppOtherPolicyVo appOtherPolicyVo = loanFinOtherPolicyService.selectByMainSids(sid); + if (appOtherPolicyVo != null) { + appPolicyDetailsVo.setOtherInfo(appOtherPolicyVo); + } + } + return rb.success().setData(appPolicyDetailsVo); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java new file mode 100644 index 0000000000..f4e15c5ade --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java @@ -0,0 +1,31 @@ +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/7/12 + **/ +@Data +public class FinancialOtherPolicyVo implements Vo { + private static final long serialVersionUID = 3695189220403491871L; + + @ApiModelProperty("产品类别") + private String productTypeValue; + + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("年利率（%）") + private String yearRatio; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java new file mode 100644 index 0000000000..3915c91547 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java @@ -0,0 +1,59 @@ +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/7/12 + **/ +@Data +public class FinancialPolicyDetailsVo implements Vo { + private static final long serialVersionUID = -439513352576615253L; + + @ApiModelProperty("政策名称") + private String policyName; + @ApiModelProperty("适用部门，黑龙江销售部或分公司") + private String useDeptNames; + @ApiModelProperty("资方简称") + private String bankShortName; + @ApiModelProperty("业务类型") + private String busTypeValue; + @ApiModelProperty("车辆大类") + private String vehCategoryValue; + @ApiModelProperty("是否打包") + private String isPack; + @ApiModelProperty("是否担保") + private String isGuarantee; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("单车意外险") + private String vehAccidentAmount; + @ApiModelProperty("最低首付比例") + private String downPayRatioLeast; + @ApiModelProperty("首付比例") + private String downPayRatio; + @ApiModelProperty("保证金比例") + private String bondRatio; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("标准年利率") + private String yearRatio; + @ApiModelProperty("服务费类型") + private String serviceAmountTypeValue; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("名义/留购价款") + private String nominalPrice; + @ApiModelProperty("有效期至") + private String validDateTo; + @ApiModelProperty("其他融") + private FinancialOtherPolicyVo otherInfo; +} 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 c477b5e290..e5da6fdd4b 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 @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** * @description: 金融产品 @@ -25,4 +26,9 @@ public interface FinancialPolicyFeign { @ApiOperation("app金融产品资方常规") @PostMapping("getProductList") ResultBean> getProductList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("app金融产品资方常规详情") + @PostMapping("getProductInfo") + ResultBean getProductInfo(@RequestParam("sid") String sid); + } 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 f35605dec8..efe2de75a4 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,5 +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; @@ -26,4 +27,9 @@ public class FinancialPolicyRest implements FinancialPolicyFeign { public ResultBean> getProductList(PagerQuery pagerQuery) { return financialPolicyService.getProductList(pagerQuery); } + + @Override + public ResultBean getProductInfo(String sid) { + return financialPolicyService.getProductInfo(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 43c56b1afe..0b5ce1f26a 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 @@ -4,10 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; 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.terminal.api.autoservice.intermediary.MiddlemanVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -41,4 +42,16 @@ public class FinancialPolicyService { v.setRecords(voList); return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } + + public ResultBean getProductInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinancialPolicyDetailsVo financialPolicyDetailsVo = new FinancialPolicyDetailsVo(); + ResultBean resultBean = loanFinPolicyFeign.getProductInfo(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppPolicyDetailsVo appPolicyDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo); + return rb.success().setData(financialPolicyDetailsVo); + } }