From feffbdf0be235d4779594e8e83894311035ac85f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 7 Oct 2023 11:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=B6=E4=BB=96=E8=9E=8D=E8=B4=B4=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdeliveredapply/BusDeliveredApply.java | 2 + .../BusDeliveredApplyFeign.java | 10 ++ .../BusDeliveredApplyFeignFallback.java | 10 ++ .../UnBusDeliveredApplyDto.java | 67 ++++++++++ .../bussalesorder/SolutionsDetailsssVo.java | 2 + .../BusDeliveredApplyRest.java | 12 ++ .../BusDeliveredApplyService.java | 120 +++++++++++++++--- .../api/crmvehicledemand/AppCrmSolutions.java | 2 + .../anrui/flowable/api/utils/ProcDefEnum.java | 7 +- .../api/loansolutions/SolutionDetailsDto.java | 3 + .../loansolutions/app/SolutionsDetailsVo.java | 4 + .../api/loansolutions/app/SolutionsDto.java | 1 + .../api/loansolutions/app/SolutionssDto.java | 3 + .../loansolutions/app/SolutionssQuery.java | 2 + .../api/loansolutions/app/SolutionssVo.java | 2 + .../calculate/CalculateQuery.java | 2 + .../loansolutions/calculate/CalculateVo.java | 2 + .../LoanSolutionsOtherpolicy.java | 3 + .../LoanTemplateSolutionsDto.java | 2 + .../loantemplate/LoanTemplateSolutionsVo.java | 2 + .../loansolutions/LoanSolutionsService.java | 96 +++++++++++--- .../api/risk/solutions/AppSolutionQuery.java | 2 + .../api/risk/solutions/AppSolutionVo.java | 2 + .../api/risk/solutions/AppSolutionssDto.java | 2 + 24 files changed, 320 insertions(+), 40 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index fadf32baf3..24ba590bd2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -125,4 +125,6 @@ public class BusDeliveredApply extends BaseEntity { private String hasInvoiceKey; @ApiModelProperty("是否开票（1开票，0不开票）") private String hasInvoice; + @ApiModelProperty("类型：0正常出库，1欠款出库") + private int typeState; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 2d893e8808..bd45f5ecf1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -70,6 +70,7 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + /** * 出库申请新增或修改 * @@ -230,5 +231,14 @@ public interface BusDeliveredApplyFeign { @ResponseBody ResultBean deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); + @ApiOperation("欠款出库申请分页列表") + @PostMapping("/unListPage") + @ResponseBody + public ResultBean> unListPage(@RequestBody PagerQuery pq); + + @ApiOperation("欠款出库保存") + @PostMapping("/unSave") + @ResponseBody + public ResultBean unSave(@RequestBody UnBusDeliveredApplyDto dto); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index fe7b749a7d..c2a7e4a4d4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -131,6 +131,16 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean> unListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean unSave(UnBusDeliveredApplyDto dto) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java new file mode 100644 index 0000000000..3f10cca241 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/7 + **/ +@Data +public class UnBusDeliveredApplyDto { + + @ApiModelProperty(value = "出库申请sid") + private String sid; + private String userSid; + @ApiModelProperty("发起部门sid") + private String applyDeptSid; + @ApiModelProperty("发起部门") + private String applyDept; + @ApiModelProperty("发起人sid") + private String applySid; + @ApiModelProperty("发起人") + private String applyName; + @ApiModelProperty("销售部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门") + private String staffDeptName; + @ApiModelProperty("销售专员用户sid") + private String staffUserSid; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("销售类型key") + private String paymentMethodKey; + @ApiModelProperty("销售类型") + private String paymentMethod; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("客户手机号") + private String mobile; + @ApiModelProperty("车型别名") + private String modelName; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("贷款人手机号") + private String loanMobile; + @ApiModelProperty("实际购车人类型:0订单客户，1贷款人，2其他人") + private String type; + @ApiModelProperty(value = "出库申请的车辆信息") + private List detailsList; + private String orgPath; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("返利人sid") + private String distributorName; + @ApiModelProperty("返利金额1") + private String distributorPrice; + @ApiModelProperty("返利人2sid") + private String distributorNameTwo; + @ApiModelProperty("返利金额2") + private String distributorPriceTwo; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 1f8875c68f..a793b8c84f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -92,6 +92,8 @@ public class SolutionsDetailsssVo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index bb6ea263d7..e45077b543 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -195,6 +195,18 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.deliveredFinSelectByBusVinSid(contractNo,vinSid); } + @Override + public ResultBean> unListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busDeliveredApplyService.unListPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean unSave(UnBusDeliveredApplyDto dto) { + return busDeliveredApplyService.unSave(dto); + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 4a59c7456a..481fe0ea31 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -352,6 +352,7 @@ public class BusDeliveredApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -388,7 +389,7 @@ public class BusDeliveredApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); - if ("1".equals(busDeliveredApply.getHasInvoiceKey())){ + if ("1".equals(busDeliveredApply.getHasInvoiceKey())) { BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData(); BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo()); BusBillApplication busBillApplication = busBillApplicationService.selectByCkSidAll(busDeliveredApply.getSid()); @@ -1033,7 +1034,7 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); @@ -1617,7 +1618,7 @@ public class BusDeliveredApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName()); List records = iPage.getRecords(); @@ -2181,7 +2183,7 @@ public class BusDeliveredApplyService extends MybatisBaseService 0){ + if (i > 0) { return rb.setMsg("车辆已存在出库中"); } } @@ -2727,16 +2729,16 @@ public class BusDeliveredApplyService extends MybatisBaseService busBillVehicleVos = busBillVehicleService.fetchByMainSid(busBillApplicationDetailsVo.getSid()); for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { - if (StringUtils.isBlank(busBillVehicleVo.getBillTypeKey())){ + if (StringUtils.isBlank(busBillVehicleVo.getBillTypeKey())) { return rb.setMsg(busBillVehicleVo.getVinNo() + "开票类型不能为空"); - }else if (StringUtils.isBlank(busBillVehicleVo.getOpenTickName())){ + } else if (StringUtils.isBlank(busBillVehicleVo.getOpenTickName())) { return rb.setMsg(busBillVehicleVo.getVinNo() + "开票名称不能为空"); } } @@ -3010,4 +3012,86 @@ public class BusDeliveredApplyService extends MybatisBaseService unListPage(PagerQuery pq) { + BusDeliveredApplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //合同编号 + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bd.contractNo", query.getContractNo()); + } + //客户名称 + if (StringUtils.isNotBlank(query.getName())) { + qw.like("bd.name", query.getName()); + } + if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) { + qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd()); + } + if (StringUtils.isNotBlank(query.getApplyName())) { + qw.like("bd.applyName", query.getApplyName()); + } + if (StringUtils.isNotBlank(query.getPaymentMethodKey())) { + qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey()); + } + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getApplySid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bd.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bd.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bd.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bd.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bd.createBySid", query.getApplySid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + qw.eq("bd.applySid", query.getApplySid()); + } + qw.eq("typeState",1); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (BusDeliveredApplyVo record : records) { + if (query.getApplySid().equals(record.getCreateBySid())) { + record.setAllowModify(true); + } else { + record.setAllowModify(false); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean unSave(UnBusDeliveredApplyDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java index 2c7e86ca0a..f2eb6b6ffd 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java @@ -97,6 +97,8 @@ public class AppCrmSolutions { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 78b17d6f04..f1d0249b5c 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -20,7 +20,7 @@ public enum ProcDefEnum { ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"), -// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), + // BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"), @@ -29,12 +29,13 @@ public enum ProcDefEnum { SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:7:3100008"), -// BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"), + // BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"), BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:10:4035008"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"), BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"), -// BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"), + // BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"), BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"), + QKBUSDELIVEREDAPPLY("欠款出库申请", ""), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java index d15cd432dc..ed90f34560 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java @@ -95,6 +95,9 @@ public class SolutionDetailsDto implements Dto { @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; private String otherPolicySid; + @ApiModelProperty("其他融贴息") + private String otherDiscount; + @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java index d64d09f8cd..697cc1210f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java @@ -100,6 +100,10 @@ public class SolutionsDetailsVo implements Vo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; + + @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java index c15c69e5df..763fb2a9cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java @@ -97,6 +97,7 @@ public class SolutionsDto implements Dto { @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("'融资首付") private String loanDownPay; @ApiModelProperty("总贷款金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java index c8f6088f6a..8ca5da3eef 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java @@ -95,6 +95,9 @@ public class SolutionssDto implements Dto { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; + @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java index 0958d6b726..d3b9c5289b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java @@ -72,6 +72,8 @@ public class SolutionssQuery implements Query { private String returnTime; private String otherPolicySid; private String otherPolicyName; + @ApiModelProperty("其他融贴息") + private String otherDiscount; /*********************************金融方案费用明细*****************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java index ea1f0739f4..3057f5fb5b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java @@ -91,6 +91,8 @@ public class SolutionssVo implements Vo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; /*************************方案汇总*********************************/ @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java index af3e27bd3b..8052cb2a99 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java @@ -63,6 +63,8 @@ public class CalculateQuery { private String otherPolicyYearRatio; @ApiModelProperty("其他融sid") private String otherPolicySid; + @ApiModelProperty("其他融贴息") + private String otherDiscount; /*********************************金融方案费用明细*****************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java index 5dc0fe1872..3136487ac8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateVo.java @@ -27,6 +27,8 @@ public class CalculateVo { private String otherPolicyMonthlyRepay; @ApiModelProperty("其它融利息总额") private String otherPolicyInterest; + @ApiModelProperty("其他融年利率") + private String otherPolicyYearRatio; /***********方案汇总*************/ @ApiModelProperty("'融资首付") 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 26659b3603..0a9f2e809b 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 @@ -82,6 +82,9 @@ public class LoanSolutionsOtherpolicy extends BaseEntity { @ApiModelProperty("实际首付比例") private String downPayAmountsRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java index 536f2e46ae..4bc66ed470 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java @@ -90,6 +90,8 @@ public class LoanTemplateSolutionsDto implements Dto { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java index e551648d5c..001e3fb4f0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java @@ -82,6 +82,8 @@ public class LoanTemplateSolutionsVo implements Vo { private String otherPolicyInterest; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融贴息") + private String otherDiscount; @ApiModelProperty("'融资首付") private String loanDownPay; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index d6873fb68a..e13c9b8cef 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1318,16 +1318,27 @@ public class LoanSolutionsService extends MybatisBaseService