From 01b725ae262c273d9a86e82dd7093e246f6b338e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 21 Mar 2023 15:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansolution/LoanSolutionFeign.java | 11 +- .../LoanSolutionFeignFallback.java | 7 +- .../LoanSolutionDetailFeign.java | 6 +- .../LoanSolutionDetailFeignFallback.java | 9 +- .../api/loansolutions/LoanSolutions.java | 63 ++++++- .../loansolutions/LoanSolutionsDetailsVo.java | 4 +- .../api/loansolutions/LoanSolutionsDto.java | 4 +- .../api/loansolutions/LoanSolutionsFeign.java | 6 +- .../LoanSolutionsFeignFallback.java | 8 +- .../api/loansolutions/LoanSolutionsQuery.java | 6 +- .../api/loansolutions/LoanSolutionsVo.java | 6 +- .../LoanSolutionsDetail.java | 51 +++++- .../LoanSolutionsDetailDetailsVo.java | 50 +++++- .../LoanSolutionsDetailDto.java | 50 +++++- .../LoanSolutionsDetailFeign.java | 4 +- .../LoanSolutionsDetailFeignFallback.java | 4 +- .../LoanSolutionsDetailQuery.java | 4 +- .../LoanSolutionsDetailVo.java | 50 +++++- .../LoanSolutionsOtherpolicy.java | 38 ++--- .../LoanSolutionsOtherpolicyDetailsVo.java | 41 ++--- .../LoanSolutionsOtherpolicyDto.java | 40 ++--- .../LoanSolutionsOtherpolicyFeign.java | 4 +- ...LoanSolutionsOtherpolicyFeignFallback.java | 9 +- .../LoanSolutionsOtherpolicyQuery.java | 40 ++--- .../LoanSolutionsOtherpolicyVo.java | 42 ++--- .../loansolutiontop/LoanSolutionTopFeign.java | 6 +- .../LoanSolutionTopFeignFallback.java | 9 +- .../LoanSolutionTrailerFeign.java | 6 +- .../LoanSolutionTrailerFeignFallback.java | 7 +- .../biz/loansolution/LoanSolutionRest.java | 11 +- .../biz/loansolution/LoanSolutionService.java | 104 ++++++------ .../LoanSolutionDetailRest.java | 4 +- .../LoanSolutionDetailService.java | 38 ++--- .../loansolutions/LoanSolutionsMapper.java | 4 +- .../biz/loansolutions/LoanSolutionsMapper.xml | 4 +- .../biz/loansolutions/LoanSolutionsRest.java | 13 +- .../loansolutions/LoanSolutionsService.java | 107 ++++-------- .../LoanSolutionsDetailMapper.java | 4 +- .../LoanSolutionsDetailMapper.xml | 4 +- .../LoanSolutionsDetailRest.java | 20 +-- .../LoanSolutionsDetailService.java | 26 +-- .../LoanSolutionsOtherpolicyMapper.java | 4 +- .../LoanSolutionsOtherpolicyMapper.xml | 4 +- .../LoanSolutionsOtherpolicyRest.java | 20 +-- .../LoanSolutionsOtherpolicyService.java | 22 +-- .../loansolutiontop/LoanSolutionTopRest.java | 4 +- .../LoanSolutionTopService.java | 32 ++-- .../LoanSolutionTrailerRest.java | 4 +- .../LoanSolutionTrailerService.java | 24 +-- .../api/risk/solutions/SolutionsFeign.java | 18 ++ .../solutions/SolutionsFeignFallback.java | 12 ++ doc/databases/risk_center.sql | 158 ++++++++++++------ 52 files changed, 671 insertions(+), 555 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeignFallback.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeign.java index 45f6084424..b8781ac37f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeign.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*; fallback = LoanSolutionFeignFallback.class) public interface LoanSolutionFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -51,19 +51,19 @@ public interface LoanSolutionFeign { public ResultBean fetchBySid(@PathVariable("sid") String sid); - /** + *//** * @param projectSid 项目sid * @description: 根据项目sid查询项目金融方案 * @return: 返回该项目的项目金融方案信息 * @Author: dimengzhe * @Date: 2021/10/28 22:15 - */ + *//* @ApiOperation(value = "根据项目sid查询项目金融方案") @PostMapping(value = "/selectByLoanPriceSid") ResultBean selectByLoanPriceSid(@RequestParam(value = "sid") String sid); - /**************************************手机端接口***********************************************/ + *//**************************************手机端接口***********************************************//* @ApiOperation("手机端根据销售订单sid获取消贷业务金融方案已完善、未完善页面") @GetMapping("/getAppLoanSolutionMainTainByOrderSid") @@ -77,7 +77,6 @@ public interface LoanSolutionFeign { @ApiOperation("手机端保存/修改融资项目") @PostMapping("/saveOrUpdateAppFinanceProject") - @ApiOperationSupport(order = 62) public ResultBean saveOrUpdateAppFinanceProject(@RequestBody AppFinanceProjectDto dto); @ApiOperation("手机端根据销售订单sid获取垫款金额") @@ -129,6 +128,6 @@ public interface LoanSolutionFeign { @PostMapping("/saveOrUpdateAppRePay") @ApiOperationSupport(order = 72) public ResultBean saveOrUpdateAppRePay(@RequestBody AppRePayDto dto); - +*/ /************************************************************************************************/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeignFallback.java index 2282f91fd5..ec9fa31672 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolution/LoanSolutionFeignFallback.java @@ -1,8 +1,5 @@ package com.yxt.anrui.riskcenter.api.loansolution; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; /** @@ -21,7 +18,7 @@ import org.springframework.stereotype.Component; @Component public class LoanSolutionFeignFallback implements LoanSolutionFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolution/listPage无法访问"); @@ -130,5 +127,5 @@ public class LoanSolutionFeignFallback implements LoanSolutionFeign { public ResultBean saveOrUpdateAppRePay(AppRePayDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolution/saveOrUpdateAppRePay无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeign.java index 087c1157ff..f9eb38ab1f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeign.java @@ -31,7 +31,7 @@ import java.util.List; fallback = LoanSolutionDetailFeignFallback.class) public interface LoanSolutionDetailFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -74,7 +74,7 @@ public interface LoanSolutionDetailFeign { - /**************************************手机端接口********************************************/ + *//**************************************手机端接口********************************************//* @ApiOperation("手机端根据orderSid查询费用明细") @GetMapping("/getAppSolutionDetailByOrderSid") @@ -83,6 +83,6 @@ public interface LoanSolutionDetailFeign { @ApiOperation("手机端保存/修改费用明细") @PostMapping("/saveOrUpdateAppSolutionDetail") - public ResultBean saveOrUpdateAppSolutionDetail(@RequestBody AppLoanSolutionDetailDto dto); + public ResultBean saveOrUpdateAppSolutionDetail(@RequestBody AppLoanSolutionDetailDto dto);*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeignFallback.java index 3ab11fba1d..553253aa72 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiondetail/LoanSolutionDetailFeignFallback.java @@ -1,12 +1,7 @@ package com.yxt.anrui.riskcenter.api.loansolutiondetail; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-riskcenter(风控中心)
* File: LoanSolutionDetailFeignFallback.java
@@ -23,7 +18,7 @@ import java.util.List; @Component public class LoanSolutionDetailFeignFallback implements LoanSolutionDetailFeign { - @Override + /*@Override public ResultBean> listPage(PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiondetail/listPage无法访问"); @@ -90,6 +85,6 @@ public class LoanSolutionDetailFeignFallback implements LoanSolutionDetailFeign public ResultBean saveOrUpdateAppSolutionDetail(AppLoanSolutionDetailDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiondetail/saveOrUpdateAppSolutionDetail无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java index 87badb4f7b..e6fd77f650 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutions.java @@ -27,7 +27,67 @@ import java.math.BigDecimal; public class LoanSolutions extends BaseEntity { private static final long serialVersionUID = 1L; - + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("类型key") + private String typeKey; + @ApiModelProperty("是否打包") + private Integer isPack; + @ApiModelProperty("产品政策") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("融资项目总额") + private BigDecimal loanTotal; + @ApiModelProperty("主车发票价") + private BigDecimal mainVehicleAmount; + @ApiModelProperty("融资票据") + private BigDecimal accessoriesAmount; + @ApiModelProperty("挂车金额") + private BigDecimal trailerAmount; + @ApiModelProperty("购置税") + private BigDecimal purchaseTax; + @ApiModelProperty("保险金额") + private BigDecimal premium; + @ApiModelProperty("车损上浮") + private BigDecimal vehDamageFloat; + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + private BigDecimal downPayAmount; + @ApiModelProperty("贷款金额") + private BigDecimal loanAmount; + @ApiModelProperty("贷款期数") + private Integer loanPeriod; + @ApiModelProperty("保证金比例") + private String bondRatio; + @ApiModelProperty("保证金金额") + private BigDecimal bondAmount; + @ApiModelProperty("厂家贴息") + private BigDecimal factoryDiscount; + @ApiModelProperty("政策年利率") + private String policyYearRatio; + @ApiModelProperty("贷款月还") + private BigDecimal loanPayMoney; + @ApiModelProperty("贷款利息") + private BigDecimal loanInterest; + + + + + + + + + + + + + + + /* @ApiModelProperty("消贷业务报价单sid") private String loanPriceSid; @@ -159,4 +219,5 @@ public class LoanSolutions extends BaseEntity { @ApiModelProperty("还款方式") private String modeOfRePay; + */ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDetailsVo.java index 0ffebb14a7..a78440cda1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDetailsVo.java @@ -29,7 +29,7 @@ import java.math.BigDecimal; @Data public class LoanSolutionsDetailsVo implements Vo { - @ApiModelProperty("项目金融方案表(总)sid") + /* @ApiModelProperty("项目金融方案表(总)sid") private String sid; @ApiModelProperty("消贷业务报价单sid") @@ -168,5 +168,5 @@ public class LoanSolutionsDetailsVo implements Vo { private LoanSolutionsOtherpolicyDetailsVo loanSolutionsOtherpolicy; @ApiModelProperty("应收明细信息") - private LoanSolutionsDetailDetailsVo loanSolutionsDetail; + private LoanSolutionsDetailDetailsVo loanSolutionsDetail;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDto.java index d69f422622..7f31ed0321 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsDto.java @@ -27,7 +27,7 @@ import java.math.BigDecimal; @Data public class LoanSolutionsDto implements Dto { - @ApiModelProperty("sid") + /* @ApiModelProperty("sid") private String sid; @ApiModelProperty("消贷业务报价单sid") @@ -166,5 +166,5 @@ public class LoanSolutionsDto implements Dto { private LoanSolutionsOtherpolicyDto loanSolutionsOtherpolicy; @ApiModelProperty("应收明细信息") - private LoanSolutionsDetailDto loanSolutionsDetail; + private LoanSolutionsDetailDto loanSolutionsDetail;*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index 98e75d1708..6bea284726 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.*; fallback = LoanSolutionsFeignFallback.class) public interface LoanSolutionsFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -50,11 +50,11 @@ public interface LoanSolutionsFeign { @GetMapping("/fetchSid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); - /**************************************手机端接口*******************************************/ + *//**************************************手机端接口*******************************************//* @ApiOperation("手机端生成项目金融方案表(总)(未用)") @PostMapping("geneAppSolutionsVo") - public ResultBean geneAppSolutionsVo(@RequestParam("orderSid") String orderSid); + public ResultBean geneAppSolutionsVo(@RequestParam("orderSid") String orderSid);*/ /* @ApiOperation("手机端查询项目金融方案表(总)") @GetMapping("/getAppSumSolutionsByOrderSid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index 94aa0d072d..d49bf1e6a6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -1,9 +1,5 @@ package com.yxt.anrui.riskcenter.api.loansolutions; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailDetailsVo; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; /** @@ -22,7 +18,7 @@ import org.springframework.stereotype.Component; @Component public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutions/listPage无法访问"); @@ -54,7 +50,7 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutions/geneAppSolutionsVo无法访问"); } - +*/ /* @Override public ResultBean getAppSumSolutionsByOrderSid(String orderSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsQuery.java index f5624ca9f5..72887265bf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsQuery.java @@ -24,10 +24,8 @@ import java.math.BigDecimal; @ApiModel(value = "项目金融方案表(总) 查询条件", description = "项目金融方案表(总) 查询条件") @Data public class LoanSolutionsQuery implements Query { - - private static final long serialVersionUID = 8897781476306534382L; - @ApiModelProperty("消贷业务报价单sid") + /* @ApiModelProperty("消贷业务报价单sid") private String loanPriceSid; @ApiModelProperty("挂车垫款") @@ -157,5 +155,5 @@ public class LoanSolutionsQuery implements Query { private BigDecimal residualsPayMoney; @ApiModelProperty("还款方式") - private String modeOfRePay; + private String modeOfRePay;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsVo.java index d137fadd03..c25c4ced52 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsVo.java @@ -24,11 +24,9 @@ import java.math.BigDecimal; @ApiModel(value = "项目金融方案表(总) 视图数据对象", description = "项目金融方案表(总) 视图数据对象") @Data public class LoanSolutionsVo implements Vo { - - private static final long serialVersionUID = -5429865833872855038L; - @ApiModelProperty("项目金融方案表(总)id") + /* @ApiModelProperty("项目金融方案表(总)id") private Integer id; @ApiModelProperty("项目金融方案表(总)sid") @@ -164,5 +162,5 @@ public class LoanSolutionsVo implements Vo { private BigDecimal residualsPayMoney; @ApiModelProperty("还款方式") - private String modeOfRePay; + private String modeOfRePay;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java index 3fdcdc3bec..c9de4a0ad2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java @@ -27,7 +27,55 @@ import java.math.BigDecimal; public class LoanSolutionsDetail extends BaseEntity { private static final long serialVersionUID = 1L; - + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("融资首付") + private BigDecimal downPayAmount; + @ApiModelProperty("贷款保证金") + private BigDecimal bondAmount; + @ApiModelProperty("保险保证金") + private BigDecimal depositPremium; + @ApiModelProperty("落户保证金") + private BigDecimal depositSettle; + + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; + @ApiModelProperty("代收意外险") + private BigDecimal proxyAccidentPremium; + @ApiModelProperty("上牌费") + private BigDecimal registerAmount; + @ApiModelProperty("运管费") + private BigDecimal operationAmount; + @ApiModelProperty("补车价") + private BigDecimal vehOtherPrice; + @ApiModelProperty("其他费用") + private BigDecimal otherAmount; + @ApiModelProperty("其他费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("代收首年保险费") + private BigDecimal proxyPremium; + @ApiModelProperty("代收购置费") + private BigDecimal proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private BigDecimal offsetPremium; + @ApiModelProperty("抵顶购置税") + private BigDecimal offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private BigDecimal offsetTotal; + @ApiModelProperty("应收合计") + private BigDecimal receivableTotal; + @ApiModelProperty("实收合计") + private BigDecimal realTotal; + @ApiModelProperty("车辆总价") + private BigDecimal vehTotalPrice; + @ApiModelProperty("名义留购价") + private BigDecimal nominalPrice; + + + + /* @ApiModelProperty("金融方案sid") private String solutionsSid; @@ -131,4 +179,5 @@ public class LoanSolutionsDetail extends BaseEntity { private String incidentalsRemarks; @ApiModelProperty("实收合计") private String prePayInterestRemarks; + */ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDetailsVo.java index 2b57b2bae1..ff276ee71f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDetailsVo.java @@ -26,7 +26,53 @@ import java.math.BigDecimal; @Data public class LoanSolutionsDetailDetailsVo implements Vo { - @ApiModelProperty("sid") + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("融资首付") + private BigDecimal downPayAmount; + @ApiModelProperty("贷款保证金") + private BigDecimal bondAmount; + @ApiModelProperty("保险保证金") + private BigDecimal depositPremium; + @ApiModelProperty("落户保证金") + private BigDecimal depositSettle; + + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; + @ApiModelProperty("代收意外险") + private BigDecimal proxyAccidentPremium; + @ApiModelProperty("上牌费") + private BigDecimal registerAmount; + @ApiModelProperty("运管费") + private BigDecimal operationAmount; + @ApiModelProperty("补车价") + private BigDecimal vehOtherPrice; + @ApiModelProperty("其他费用") + private BigDecimal otherAmount; + @ApiModelProperty("其他费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("代收首年保险费") + private BigDecimal proxyPremium; + @ApiModelProperty("代收购置费") + private BigDecimal proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private BigDecimal offsetPremium; + @ApiModelProperty("抵顶购置税") + private BigDecimal offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private BigDecimal offsetTotal; + @ApiModelProperty("应收合计") + private BigDecimal receivableTotal; + @ApiModelProperty("实收合计") + private BigDecimal realTotal; + @ApiModelProperty("车辆总价") + private BigDecimal vehTotalPrice; + @ApiModelProperty("名义留购价") + private BigDecimal nominalPrice; + + /*@ApiModelProperty("sid") private String sid; @ApiModelProperty("金融方案sid") private String solutionsSid; @@ -141,5 +187,5 @@ public class LoanSolutionsDetailDetailsVo implements Vo { private String incidentalsRemarks; @ApiModelProperty("利息前置备注") - private String prePayInterestRemarks; + private String prePayInterestRemarks;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDto.java index 291df2cd1f..6fac0c7a56 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailDto.java @@ -25,8 +25,54 @@ import java.math.BigDecimal; @Data public class LoanSolutionsDetailDto implements Dto { + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("融资首付") + private BigDecimal downPayAmount; + @ApiModelProperty("贷款保证金") + private BigDecimal bondAmount; + @ApiModelProperty("保险保证金") + private BigDecimal depositPremium; + @ApiModelProperty("落户保证金") + private BigDecimal depositSettle; + + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; + @ApiModelProperty("代收意外险") + private BigDecimal proxyAccidentPremium; + @ApiModelProperty("上牌费") + private BigDecimal registerAmount; + @ApiModelProperty("运管费") + private BigDecimal operationAmount; + @ApiModelProperty("补车价") + private BigDecimal vehOtherPrice; + @ApiModelProperty("其他费用") + private BigDecimal otherAmount; + @ApiModelProperty("其他费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("代收首年保险费") + private BigDecimal proxyPremium; + @ApiModelProperty("代收购置费") + private BigDecimal proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private BigDecimal offsetPremium; + @ApiModelProperty("抵顶购置税") + private BigDecimal offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private BigDecimal offsetTotal; + @ApiModelProperty("应收合计") + private BigDecimal receivableTotal; + @ApiModelProperty("实收合计") + private BigDecimal realTotal; + @ApiModelProperty("车辆总价") + private BigDecimal vehTotalPrice; + @ApiModelProperty("名义留购价") + private BigDecimal nominalPrice; + - @ApiModelProperty("金融方案sid") + /*@ApiModelProperty("金融方案sid") private String solutionsSid; @ApiModelProperty("应收车价首付") @@ -128,5 +174,5 @@ public class LoanSolutionsDetailDto implements Dto { @ApiModelProperty("杂费备注") private String incidentalsRemarks; @ApiModelProperty("实收合计") - private String prePayInterestRemarks; + private String prePayInterestRemarks;*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeign.java index 5003587ae1..e95a6092d4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeign.java @@ -31,7 +31,7 @@ import java.util.List; fallback = LoanSolutionsDetailFeignFallback.class) public interface LoanSolutionsDetailFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -49,5 +49,5 @@ public interface LoanSolutionsDetailFeign { @ApiOperation("获取一条记录") @GetMapping("/fetchSid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); + public ResultBean fetchBySid(@PathVariable("sid") String sid);*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeignFallback.java index d38b4d6071..7f8b1e6388 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailFeignFallback.java @@ -23,7 +23,7 @@ import java.util.List; @Component public class LoanSolutionsDetailFeignFallback implements LoanSolutionsDetailFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutionsdetail/listPage无法访问"); @@ -49,6 +49,6 @@ public class LoanSolutionsDetailFeignFallback implements LoanSolutionsDetailFeig public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutionsdetail/fetch无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailQuery.java index e129314856..86eb48c97f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailQuery.java @@ -26,7 +26,7 @@ import java.math.BigDecimal; public class LoanSolutionsDetailQuery implements Query { - @ApiModelProperty("金融方案sid") +/* @ApiModelProperty("金融方案sid") private String solutionsSid; @ApiModelProperty("应收车价首付") @@ -99,5 +99,5 @@ public class LoanSolutionsDetailQuery implements Query { private BigDecimal actualPrePayInterest; @ApiModelProperty("已收订金") - private BigDecimal depositReceived; + private BigDecimal depositReceived;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailVo.java index ec6649cafb..297a8c5df5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetailVo.java @@ -26,7 +26,53 @@ import java.math.BigDecimal; @Data public class LoanSolutionsDetailVo implements Vo { - @ApiModelProperty("sid") + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("融资首付") + private BigDecimal downPayAmount; + @ApiModelProperty("贷款保证金") + private BigDecimal bondAmount; + @ApiModelProperty("保险保证金") + private BigDecimal depositPremium; + @ApiModelProperty("落户保证金") + private BigDecimal depositSettle; + + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; + @ApiModelProperty("代收意外险") + private BigDecimal proxyAccidentPremium; + @ApiModelProperty("上牌费") + private BigDecimal registerAmount; + @ApiModelProperty("运管费") + private BigDecimal operationAmount; + @ApiModelProperty("补车价") + private BigDecimal vehOtherPrice; + @ApiModelProperty("其他费用") + private BigDecimal otherAmount; + @ApiModelProperty("其他费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("代收首年保险费") + private BigDecimal proxyPremium; + @ApiModelProperty("代收购置费") + private BigDecimal proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private BigDecimal offsetPremium; + @ApiModelProperty("抵顶购置税") + private BigDecimal offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private BigDecimal offsetTotal; + @ApiModelProperty("应收合计") + private BigDecimal receivableTotal; + @ApiModelProperty("实收合计") + private BigDecimal realTotal; + @ApiModelProperty("车辆总价") + private BigDecimal vehTotalPrice; + @ApiModelProperty("名义留购价") + private BigDecimal nominalPrice; + + /* @ApiModelProperty("sid") private String sid; @ApiModelProperty("金融方案sid") private String solutionsSid; @@ -141,5 +187,5 @@ public class LoanSolutionsDetailVo implements Vo { private String incidentalsRemarks; @ApiModelProperty("利息前置备注") - private String prePayInterestRemarks; + private String prePayInterestRemarks;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java index 612b178b93..af1fcbd24b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java @@ -52,31 +52,17 @@ import java.math.BigDecimal; public class LoanSolutionsOtherpolicy extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("主产品方案sid") - private String solutionsSid; // 主产品方案sid - @ApiModelProperty("其它融资方名称") - private String otherPolicyBankName; // 其它融资方名称 - @ApiModelProperty("其它融产品sid") - private String otherPolicySid; // 其它融产品sid - @ApiModelProperty("其它融名称") - private String otherPolicyName; // 其它融名称 - @ApiModelProperty("其它融金额") - private Integer otherPolicyAmount; // 其它融金额 - @ApiModelProperty("其它融期数") - private Integer otherPolicyPeriod; // 其它融期数 - @ApiModelProperty("其它融月还") - private BigDecimal otherPolicyMonthlyRepay; // 其它融月还 - @ApiModelProperty("其它融利息总额") - private BigDecimal otherPolicyInterest; // 其它融利息总额 - @ApiModelProperty("融资首付") - private Integer loanDownPay; // 融资首付 - @ApiModelProperty("总贷款金额") - private Integer loanAmountTotal; // 总贷款金额 - @ApiModelProperty("期数") - private Integer period; // 期数 - @ApiModelProperty("月还金额") - private BigDecimal monthlyRepay; // 月还金额 - @ApiModelProperty("利息总额") - private BigDecimal interest; // 利息总额 + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private Integer otherPolicyAmount; + @ApiModelProperty("其它融期数") + private Integer otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private BigDecimal otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private BigDecimal otherPolicyInterest; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDetailsVo.java index 22340a4405..4bd1a260c4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDetailsVo.java @@ -50,34 +50,19 @@ import java.math.BigDecimal; @Data @ApiModel(value = "金融方案表_其它融 视图数据详情", description = "金融方案表_其它融 视图数据详情") public class LoanSolutionsOtherpolicyDetailsVo implements Vo { + private static final long serialVersionUID = -7069039362317326246L; - private String sid; // sid - - @ApiModelProperty("主产品方案sid") - private String solutionsSid; // 主产品方案sid - @ApiModelProperty("其它融资方名称") - private String otherPolicyBankName; // 其它融资方名称 - @ApiModelProperty("其它融产品sid") - private String otherPolicySid; // 其它融产品sid - @ApiModelProperty("其它融名称") - private String otherPolicyName; // 其它融名称 - @ApiModelProperty("其它融金额") - private Integer otherPolicyAmount; // 其它融金额 - @ApiModelProperty("其它融期数") - private Integer otherPolicyPeriod; // 其它融期数 - @ApiModelProperty("其它融月还") - private BigDecimal otherPolicyMonthlyRepay; // 其它融月还 - @ApiModelProperty("其它融利息总额") - private BigDecimal otherPolicyInterest; // 其它融利息总额 - @ApiModelProperty("融资首付") - private Integer loanDownPay; // 融资首付 - @ApiModelProperty("总贷款金额") - private Integer loanAmountTotal; // 总贷款金额 - @ApiModelProperty("期数") - private Integer period; // 期数 - @ApiModelProperty("月还金额") - private BigDecimal monthlyRepay; // 月还金额 - @ApiModelProperty("利息总额") - private BigDecimal interest; // 利息总额 + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private Integer otherPolicyAmount; + @ApiModelProperty("其它融期数") + private Integer otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private BigDecimal otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private BigDecimal otherPolicyInterest; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDto.java index 4e55f3e8e6..597bd9ad61 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyDto.java @@ -50,32 +50,18 @@ import java.math.BigDecimal; @Data @ApiModel(value = "金融方案表_其它融 数据传输对象", description = "金融方案表_其它融 数据传输对象") public class LoanSolutionsOtherpolicyDto implements Dto { + private static final long serialVersionUID = -8720344689421227251L; - @ApiModelProperty("主产品方案sid") - private String solutionsSid; // 主产品方案sid - @ApiModelProperty("其它融资方名称") - private String otherPolicyBankName; // 其它融资方名称 - @ApiModelProperty("其它融产品sid") - private String otherPolicySid; // 其它融产品sid - @ApiModelProperty("其它融名称") - private String otherPolicyName; // 其它融名称 - @ApiModelProperty("其它融金额") - private Integer otherPolicyAmount; // 其它融金额 - @ApiModelProperty("其它融期数") - private Integer otherPolicyPeriod; // 其它融期数 - @ApiModelProperty("其它融月还") - private BigDecimal otherPolicyMonthlyRepay; // 其它融月还 - @ApiModelProperty("其它融利息总额") - private BigDecimal otherPolicyInterest; // 其它融利息总额 - @ApiModelProperty("融资首付") - private Integer loanDownPay; // 融资首付 - @ApiModelProperty("总贷款金额") - private Integer loanAmountTotal; // 总贷款金额 - @ApiModelProperty("期数") - private Integer period; // 期数 - @ApiModelProperty("月还金额") - private BigDecimal monthlyRepay; // 月还金额 - @ApiModelProperty("利息总额") - private BigDecimal interest; // 利息总额 - + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private Integer otherPolicyAmount; + @ApiModelProperty("其它融期数") + private Integer otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private BigDecimal otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private BigDecimal otherPolicyInterest; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeign.java index e5ed5e7768..ec7af50fc9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeign.java @@ -56,7 +56,7 @@ import java.util.List; fallback = LoanSolutionsOtherpolicyFeignFallback.class) public interface LoanSolutionsOtherpolicyFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -74,5 +74,5 @@ public interface LoanSolutionsOtherpolicyFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeignFallback.java index 4313dac0fc..69adcf471e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyFeignFallback.java @@ -25,13 +25,8 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-riskcenter(金融方案其他融)
* File: LoanSolutionsOtherpolicyFeignFallback.java
@@ -48,7 +43,7 @@ import java.util.List; @Component public class LoanSolutionsOtherpolicyFeignFallback implements LoanSolutionsOtherpolicyFeign { - @Override + /*@Override public ResultBean> listPage(PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutionsotherpolicy/listPage无法访问"); @@ -68,5 +63,5 @@ public class LoanSolutionsOtherpolicyFeignFallback implements LoanSolutionsOther public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutionsotherpolicy/fetchDetailsBySid无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyQuery.java index f13f8273b0..b59dc38890 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyQuery.java @@ -50,32 +50,18 @@ import java.math.BigDecimal; @Data @ApiModel(value = "金融方案表_其它融 查询条件", description = "金融方案表_其它融 查询条件") public class LoanSolutionsOtherpolicyQuery implements Query { + private static final long serialVersionUID = -417723998808921211L; - @ApiModelProperty("主产品方案sid") - private String solutionsSid; // 主产品方案sid - @ApiModelProperty("其它融资方名称") - private String otherPolicyBankName; // 其它融资方名称 - @ApiModelProperty("其它融产品sid") - private String otherPolicySid; // 其它融产品sid - @ApiModelProperty("其它融名称") - private String otherPolicyName; // 其它融名称 - @ApiModelProperty("其它融金额") - private Integer otherPolicyAmount; // 其它融金额 - @ApiModelProperty("其它融期数") - private Integer otherPolicyPeriod; // 其它融期数 - @ApiModelProperty("其它融月还") - private BigDecimal otherPolicyMonthlyRepay; // 其它融月还 - @ApiModelProperty("其它融利息总额") - private BigDecimal otherPolicyInterest; // 其它融利息总额 - @ApiModelProperty("融资首付") - private Integer loanDownPay; // 融资首付 - @ApiModelProperty("总贷款金额") - private Integer loanAmountTotal; // 总贷款金额 - @ApiModelProperty("期数") - private Integer period; // 期数 - @ApiModelProperty("月还金额") - private BigDecimal monthlyRepay; // 月还金额 - @ApiModelProperty("利息总额") - private BigDecimal interest; // 利息总额 - + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private Integer otherPolicyAmount; + @ApiModelProperty("其它融期数") + private Integer otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private BigDecimal otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private BigDecimal otherPolicyInterest; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyVo.java index 3766c0ebc4..8ef40d97a7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicyVo.java @@ -50,34 +50,18 @@ import java.math.BigDecimal; @Data @ApiModel(value = "金融方案表_其它融 视图数据对象", description = "金融方案表_其它融 视图数据对象") public class LoanSolutionsOtherpolicyVo implements Vo { + private static final long serialVersionUID = 1549812974518424429L; - private String sid; // sid - - @ApiModelProperty("主产品方案sid") - private String solutionsSid; // 主产品方案sid - @ApiModelProperty("其它融资方名称") - private String otherPolicyBankName; // 其它融资方名称 - @ApiModelProperty("其它融产品sid") - private String otherPolicySid; // 其它融产品sid - @ApiModelProperty("其它融名称") - private String otherPolicyName; // 其它融名称 - @ApiModelProperty("其它融金额") - private Integer otherPolicyAmount; // 其它融金额 - @ApiModelProperty("其它融期数") - private Integer otherPolicyPeriod; // 其它融期数 - @ApiModelProperty("其它融月还") - private BigDecimal otherPolicyMonthlyRepay; // 其它融月还 - @ApiModelProperty("其它融利息总额") - private BigDecimal otherPolicyInterest; // 其它融利息总额 - @ApiModelProperty("融资首付") - private Integer loanDownPay; // 融资首付 - @ApiModelProperty("总贷款金额") - private Integer loanAmountTotal; // 总贷款金额 - @ApiModelProperty("期数") - private Integer period; // 期数 - @ApiModelProperty("月还金额") - private BigDecimal monthlyRepay; // 月还金额 - @ApiModelProperty("利息总额") - private BigDecimal interest; // 利息总额 - + @ApiModelProperty("主产品方案sid") + private String solutionsSid; + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其它融金额") + private Integer otherPolicyAmount; + @ApiModelProperty("其它融期数") + private Integer otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private BigDecimal otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private BigDecimal otherPolicyInterest; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeign.java index 140c7097a1..eb8f26ddd7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeign.java @@ -31,7 +31,7 @@ import java.util.List; fallback = LoanSolutionTopFeignFallback.class) public interface LoanSolutionTopFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -55,7 +55,7 @@ public interface LoanSolutionTopFeign { @GetMapping("/getTopByOrderSid/{orderSid}") public LoanSolutionTopVo getTopByOrderSid(@PathVariable("orderSid") String orderSid); - /****************************************手机端接口*********************************************/ + *//****************************************手机端接口*********************************************//* @ApiOperation("手机端根据订单sid查询车辆上装列表") @GetMapping("/getAppTopListByOrderSid") @@ -72,7 +72,7 @@ public interface LoanSolutionTopFeign { @ApiOperation("手机端根据车辆上装信息sid删除上装") @PostMapping("/delAppLoanSolutionTopBySid") public ResultBean delAppLoanSolutionTopBySid(@RequestParam("sid") String sid); - +*/ /***********************************************************************************************/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeignFallback.java index 7a59b21b5d..11c87e44fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontop/LoanSolutionTopFeignFallback.java @@ -1,12 +1,7 @@ package com.yxt.anrui.riskcenter.api.loansolutiontop; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-riskcenter(风控中心)
* File: LoanSolutionTopFeignFallback.java
@@ -23,7 +18,7 @@ import java.util.List; @Component public class LoanSolutionTopFeignFallback implements LoanSolutionTopFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiontop/listPage无法访问"); @@ -77,5 +72,5 @@ public class LoanSolutionTopFeignFallback implements LoanSolutionTopFeign { public ResultBean delAppLoanSolutionTopBySid(String sid) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiontop/delAppLoanSolutionTopBySid无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeign.java index e6953a3197..7ee3236d9f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeign.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*; fallback = LoanSolutionTrailerFeignFallback.class) public interface LoanSolutionTrailerFeign { - @ApiOperation("根据条件分页查询数据的列表") + /* @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -54,7 +54,7 @@ public interface LoanSolutionTrailerFeign { @GetMapping("/getTraByOrderSid/{orderSid}") public LoanSolutionTrailerVo getTraByOrderSid(@PathVariable("orderSid") String orderSid); - /****************************************手机端接口***************************************/ + *//****************************************手机端接口***************************************//* @ApiOperation("手机端根据订单sid查询挂车信息") @GetMapping("/getAppTrailerVoByOrderSid") @@ -63,7 +63,7 @@ public interface LoanSolutionTrailerFeign { @ApiOperation("手机端保存/修改挂车信息") @PostMapping("/saveOrUpdateAppTrailerVo") public ResultBean saveOrUpdateAppTrailerVo(@RequestBody AppLoanSolutionTrailerDto dto); - +*/ /*****************************************************************************************/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeignFallback.java index 1a379bdfba..986694bbcb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutiontrailer/LoanSolutionTrailerFeignFallback.java @@ -1,8 +1,5 @@ package com.yxt.anrui.riskcenter.api.loansolutiontrailer; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; /** @@ -21,7 +18,7 @@ import org.springframework.stereotype.Component; @Component public class LoanSolutionTrailerFeignFallback implements LoanSolutionTrailerFeign { - @Override + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiontrailer/listPage无法访问"); @@ -63,5 +60,5 @@ public class LoanSolutionTrailerFeignFallback implements LoanSolutionTrailerFeig public ResultBean saveOrUpdateAppTrailerVo(AppLoanSolutionTrailerDto dto) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loansolutiontrailer/saveOrUpdateAppTrailerVo无法访问"); - } + }*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java index 7253e1d85b..77fed2b563 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java @@ -1,13 +1,8 @@ package com.yxt.anrui.riskcenter.biz.loansolution; -import com.yxt.anrui.riskcenter.api.loansolution.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.riskcenter.api.loansolution.LoanSolutionFeign; import io.swagger.annotations.Api; -import com.yxt.common.base.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,7 +26,7 @@ public class LoanSolutionRest implements LoanSolutionFeign { @Autowired private LoanSolutionService loanSolutionService; - +/* @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -198,5 +193,5 @@ public class LoanSolutionRest implements LoanSolutionFeign { @Override public ResultBean saveOrUpdateAppRePay(AppRePayDto dto) { return loanSolutionService.saveOrUpdateAppRePay(dto); - } + }*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java index 1f44a4e8f8..b9fb2a7319 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java @@ -61,7 +61,7 @@ import java.util.UUID; */ @Service public class LoanSolutionService extends MybatisBaseService { - @Autowired + /* @Autowired private LoanSolutionsService loanSolutionsService; @Autowired private LoanSolutionTopService loanSolutionTopService; @@ -71,8 +71,8 @@ public class LoanSolutionService extends MybatisBaseService resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); + *//* ResultBean resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); if (resultBean.getSuccess() && resultBean.getData() != null) { vo.setMainVehicleState(1); - }*/ + }*//* // 是否展示挂车价款信息 if (financeProjectVo != null && financeProjectVo.getPackingProject().contains("挂车")) { @@ -398,11 +398,11 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + *//* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal trailerAdvance = StringUtils.toBigDecimal(dto.getTrailerAdvance()); map.put("trailerAdvance", trailerAdvance); mapSum.put("trailerAdvance", trailerAdvance == null ? null : trailerAdvance.multiply(num)); BigDecimal topcoatAdvance = StringUtils.toBigDecimal(dto.getTopcoatAdvance()); map.put("topcoatAdvance", topcoatAdvance); mapSum.put("topcoatAdvance", topcoatAdvance == null ? null : topcoatAdvance.multiply(num)); - map.put("sid", loanSolution.getSid());*/ + map.put("sid", loanSolution.getSid());*//* baseMapper.updateAppAdvance(map); // 总表 LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); @@ -559,11 +559,11 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /* + *//* map.put("bankAccess", dto.getBankAccess()); mapSum.put("bankAccess", dto.getBankAccess()); map.put("productPolicy", dto.getProductPolicy()); @@ -633,7 +633,7 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + *//* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal downPay = StringUtils.toBigDecimal(dto.getDownPay()); map.put("downPay", downPay); mapSum.put("downPay", downPay == null ? null : downPay.multiply(num)); @@ -687,7 +687,7 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + *//* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal advanceAmount = StringUtils.toBigDecimal(dto.getAdvanceAmount()); map.put("advanceAmount", advanceAmount); mapSum.put("advanceAmount", advanceAmount == null ? null : advanceAmount.multiply(num)); @@ -740,7 +740,7 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + *//*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); map.put("prophase", StringUtils.isBlank(dto.getProphase()) ? null : dto.getProphase()); mapSum.put("prophase", StringUtils.isBlank(dto.getProphase()) ? null : dto.getProphase()); BigDecimal prophasePayMonkey = StringUtils.toBigDecimal(dto.getProphasePayMoney()); @@ -791,7 +791,7 @@ public class LoanSolutionService extends MybatisBaseService> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); PagerVo pv = loanSolutionDetailService.listPageVo(pq); @@ -204,6 +204,6 @@ public class LoanSolutionDetailRest implements LoanSolutionDetailFeign { @Transactional public ResultBean saveOrUpdateAppSolutionDetail(AppLoanSolutionDetailDto dto) { return loanSolutionDetailService.saveOrUpdateAppSolutionDetail(dto); - } + }*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java index 37b60d3d80..24512ea42c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java @@ -51,14 +51,14 @@ import java.util.UUID; @Service public class LoanSolutionDetailService extends MybatisBaseService { - @Autowired + /*@Autowired private LoanLoadpriceService loanLoadpriceService; @Autowired private LoanSolutionService loanSolutionService; @Autowired private LoanSolutionInciexplainService loanSolutionInciexplainService; -/* @Autowired - private BusOrderModelFeign busOrderModelFeign;*/ +*//* @Autowired + private BusOrderModelFeign busOrderModelFeign;*//* @Autowired private LoanSolutionsService loanSolutionsService; @Autowired @@ -212,11 +212,11 @@ public class LoanSolutionDetailService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - /*BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay()); + *//*BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay()); map.put("receCarDownPay", receCarDownPay); mapSum.put("receCarDownPay", receCarDownPay == null ? null : receCarDownPay.multiply(num)); BigDecimal receLoanMargin = StringUtils.toBigDecimal(dto.getReceLoanMargin()); @@ -389,7 +389,7 @@ public class LoanSolutionDetailService extends MybatisBaseService { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + /* IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); @Select("select * from loan_solutions where loanPriceSid=#{loanPriceSid}") LoanSolutions selectByLoanPriceSid(@Param("loanPriceSid") String loanPriceSid); @@ -44,5 +44,5 @@ public interface LoanSolutionsMapper extends BaseMapper { int updateAppCorpAdvance(Map map); - int updateAppRePayByMap(Map map); + int updateAppRePayByMap(Map map);*/ } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml index 116d3bbfe8..94b886bc72 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailRest.java index c2ac023312..d4308a20ab 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailRest.java @@ -1,20 +1,10 @@ package com.yxt.anrui.riskcenter.biz.loansolutionsdetail; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailQuery; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailVo; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailDto; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Project: anrui-riskcenter(风控中心)
@@ -37,7 +27,7 @@ public class LoanSolutionsDetailRest implements LoanSolutionsDetailFeign { @Autowired private LoanSolutionsDetailService loanSolutionsDetailService; - @Override + /* @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = loanSolutionsDetailService.listPageVo(pq); @@ -70,5 +60,5 @@ public class LoanSolutionsDetailRest implements LoanSolutionsDetailFeign { ResultBean rb = ResultBean.fireFail(); LoanSolutionsDetail vo = loanSolutionsDetailService.fetchBySid(sid); return rb.success().setData(vo); - } + }*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java index 33b22d4774..89867b7c38 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java @@ -1,23 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loansolutionsdetail; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.*; -import com.yxt.anrui.riskcenter.api.loansolutiondetail.LoanSolutionDetailDto; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailDto; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailQuery; -import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailVo; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.util.Map; - /** * Project: anrui-riskcenter(风控中心)
* File: LoanSolutionsDetailService.java
@@ -33,7 +19,7 @@ import java.util.Map; */ @Service public class LoanSolutionsDetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanSolutionsDetailQuery query) { + /*private QueryWrapper createQueryWrapper(LoanSolutionsDetailQuery query) { QueryWrapper qw = new QueryWrapper<>(); return qw; @@ -61,11 +47,11 @@ public class LoanSolutionsDetailService extends MybatisBaseService map) { return baseMapper.updateAppDetailByMap(map); } @@ -251,5 +237,5 @@ public class LoanSolutionsDetailService extends MybatisBaseService voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + /*IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -69,5 +69,5 @@ public interface LoanSolutionsOtherpolicyMapper extends BaseMapper -