From 755f482754f566dbad5d4682058151676dc7357f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 11 Jul 2023 14:34:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E4=BA=A7=E5=93=81=E6=94=BF?= =?UTF-8?q?=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicy.java | 2 - .../LoanFinOtherPolicyFeign.java | 8 ++ .../LoanFinOtherPolicyVos.java | 59 ++++++++++ .../api/loanfinpolicy/LoanFinPolicyVos.java | 4 + .../LoanFinOtherPolicyMapper.java | 3 + .../LoanFinOtherPolicyMapper.xml | 6 + .../LoanFinOtherPolicyRest.java | 14 ++- .../LoanFinOtherPolicyService.java | 8 ++ .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 3 +- .../loanfinpolicy/LoanFinPolicyService.java | 11 +- doc/databases/risk_center.sql | 105 ------------------ 11 files changed, 113 insertions(+), 110 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java index 7d48796155..3daad8eb06 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java @@ -57,8 +57,6 @@ public class LoanFinOtherPolicy extends BaseEntity { private int useSate; @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") private int riskState; - @ApiModelProperty("是否有其他融：1有，0无") - private int isOtherProduct; @ApiModelProperty("适用销售部门sids(逗号分隔)") private String useDeptSids; @ApiModelProperty("适用销售部门名称(逗号分隔)") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index c65188076f..3df0d6c84c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -1,7 +1,11 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * @description: 其他融产品 @@ -15,4 +19,8 @@ import org.springframework.cloud.openfeign.FeignClient; path = "v1/LoanFinOtherPolicy", fallback = LoanFinOtherPolicyFeignFallback.class) public interface LoanFinOtherPolicyFeign { + + @GetMapping("details") + @ApiOperation("详情") + ResultBean details(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java new file mode 100644 index 0000000000..361c1411b5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java @@ -0,0 +1,59 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/11 + **/ +@Data +public class LoanFinOtherPolicyVos { + + @ApiModelProperty("资方名称") + private String bankShortName; + @ApiModelProperty("其他融名称（资方+产品类别+最高融资比例+期数）") + private String otherPolicyName; + @ApiModelProperty("资方sid") + private String bankSid; + @ApiModelProperty("主产品sid") + private String mainPolicySid; + @ApiModelProperty("适用销售部门sids(逗号分隔)") + private String useDeptSids; + @ApiModelProperty("适用销售部门名称(逗号分隔)") + private String useDeptNames; + @ApiModelProperty("适用销售部门List") + private List useDeptList = new ArrayList<>(); + @ApiModelProperty("产品类别key") + private String productTypeKey; + @ApiModelProperty("产品类别value") + private String productTypeValue; + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value") + private String busTypeValue; + @ApiModelProperty("车辆大类key") + private String vehCategoryKey; + @ApiModelProperty("车辆大类value") + private String vehCategoryValue; + @ApiModelProperty("车辆功能key") + private String vehTypeKey; + @ApiModelProperty("车辆功能value") + private String vehTypeValue; + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + @ApiModelProperty("期数") + private int period; + private String periodKey; + @ApiModelProperty("年利率（%）") + private String yearRatio; + @ApiModelProperty("有效期至") + private String validDateTo; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java index f6f47bd413..cde3296ddd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanfinpolicy; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,8 @@ import lombok.Data; public class LoanFinPolicyVos implements Vo { private static final long serialVersionUID = 7126087240752513932L; private String sid; + @ApiModelProperty("其他融sid") + private String otherPolicySid; @ApiModelProperty("报备状态") private String filingStateValue; @ApiModelProperty("风控状态") @@ -52,5 +55,6 @@ public class LoanFinPolicyVos implements Vo { @ApiModelProperty("名义/留购价款") private String nominalPrice; @ApiModelProperty("是否有其他融") + @JsonProperty("isOtherProduct") private boolean isOtherProduct; } 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 e21fa63763..8d6acac3db 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 @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -18,4 +19,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper int deleteMainSid(String sid); LoanFinOtherPolicy selectByMainSid(String sid); + + LoanFinOtherPolicyVos details(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 f5aa86908d..8cf8cd214f 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 @@ -22,4 +22,10 @@ from loan_fin_otherpolicy where mainPolicySid = #{mainPolicySid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index abda4d624f..fabf4db2e8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -1,6 +1,10 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyFeign; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,5 +16,13 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "其他融产品") @RestController @RequestMapping("v1/LoanFinOtherPolicy") -public class LoanFinOtherPolicyRest { +public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { + + @Autowired + private LoanFinOtherPolicyService loanFinOtherPolicyService; + + @Override + public ResultBean details(String sid) { + return loanFinOtherPolicyService.details(sid); + } } 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 c37558b2f9..bd1fb0f3f6 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,7 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; import java.util.List; @@ -32,4 +34,10 @@ public class LoanFinOtherPolicyService extends MybatisBaseService details(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanFinOtherPolicyVos loanFinOtherPolicyVos = baseMapper.details(sid); + return rb.success().setData(loanFinOtherPolicyVos); + } } 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 412612fb59..3b0afdade4 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 @@ -34,7 +34,8 @@ case lfp.isOtherProduct when 1 then true when 0 then false - end as isOtherProduct + end as isOtherProduct, + lfop.sid as otherPolicySid from loan_fin_policy lfp left join loan_fin_otherpolicy lfop on lfp.sid = lfop.mainPolicySid 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 90ba7cf712..03273cb33e 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 @@ -76,12 +76,15 @@ public class LoanFinPolicyService extends MybatisBaseService