diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index d985c49fd1..e8398435a4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -40,6 +40,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; @@ -117,7 +118,7 @@ public class BaseDistributorService extends MybatisBaseService> 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..e2c6fd562e 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 @@ -135,6 +135,7 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -252,7 +253,7 @@ public class BusDeliveredApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -388,7 +390,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()); @@ -928,7 +930,7 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); @@ -1617,7 +1619,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 +2184,7 @@ public class BusDeliveredApplyService extends MybatisBaseService 0){ + if (i > 0) { return rb.setMsg("车辆已存在出库中"); } } @@ -2727,16 +2730,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 +3013,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-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 6f2af40b2d..7c1f424da9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -99,6 +99,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.*; @@ -211,7 +212,7 @@ public class FinBillApplicationService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -787,7 +788,7 @@ public class FinBillApplicationService extends MybatisBaseService useOrgSids = new ArrayList<>(); + @ApiModelProperty("使用组织名称") + private List useOrgNames = new ArrayList<>(); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterDto.java new file mode 100644 index 0000000000..7620d602fe --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.portal.api.sysparameter; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:12 + */ +@Data +public class SysParameterDto implements Dto { + + private String sid; + private String remarks; + private String userSid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织全路径") + private String orgPath; + @ApiModelProperty("使用组织sid") + private List useOrgSids = new ArrayList<>(); + @ApiModelProperty("使用组织名称") + private List useOrgNames = new ArrayList<>(); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeign.java new file mode 100644 index 0000000000..8eea23d5cb --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeign.java @@ -0,0 +1,80 @@ +package com.yxt.anrui.portal.api.sysparameter; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * @description: 风控参数 + * @author: fan + * @date: 2023/7/6 + **/ +@Api(tags = "风控参数") +@FeignClient( + contextId = "anrui-portal-SysParameter", + name = "anrui-portal", + path = "v1/sysparameter", + fallback = SysParameterFeignFallback.class) +public interface SysParameterFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("新增或修改") + @PostMapping("/saveOrUpdate") + @ResponseBody + public ResultBean saveOrUpdateParameter(@RequestBody SysParameterDto dto); + + @ApiOperation("批量删除") + @DeleteMapping("/deleteBySids") + @ResponseBody + public ResultBean deleteBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据参数编码查询参数值") + @PostMapping("/fetchByParNo") + @ResponseBody + ResultBean fetchByParNo(@RequestParam("parNo") String parNo); + + @ApiOperation("根据参数编码查询记录") + @PostMapping("/fetchOneByParNo") + @ResponseBody + ResultBean fetchOneByParNo(@RequestParam("parNo") String parNo); + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询财务参数数据的列表") + @PostMapping("/finListPage") + public ResultBean> finListPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/finSave") + @ResponseBody + public ResultBean finSaveParameter(@RequestBody SysParameterDto dto); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchFinDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchFinDetailsBySid(@PathVariable("sid") String sid); + + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeignFallback.java new file mode 100644 index 0000000000..1426dc6292 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeignFallback.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.portal.api.sysparameter; + +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; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:36 + */ +@Component +public class SysParameterFeignFallback implements SysParameterFeign { + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdateParameter(SysParameterDto dto) { + return null; + } + + + @Override + public ResultBean deleteBySids(String[] sids) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean fetchByParNo(String parNo) { + return null; + } + + @Override + public ResultBean fetchOneByParNo(String parNo) { + return null; + } + + @Override + public ResultBean> finListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean finSaveParameter(SysParameterDto dto) { + return null; + } + + @Override + public ResultBean fetchFinDetailsBySid(String sid) { + return null; + } +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterQuery.java new file mode 100644 index 0000000000..4d146894d2 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.portal.api.sysparameter; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:05 + */ +@Data +public class SysParameterQuery implements Query { + + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("用户sid") + private String userSid; + + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterVo.java new file mode 100644 index 0000000000..37ca4758cb --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysparameter; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:04 + */ +@Data +public class SysParameterVo implements Vo { + private String sid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("分公司") + private String useOrgName; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.java new file mode 100644 index 0000000000..5769f19ace --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.portal.biz.sysparameter; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.portal.api.sysparameter.SysParameter; +import com.yxt.anrui.portal.api.sysparameter.SysParameterVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Mapper +public interface SysParameterMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + int updateBySidDelete(String sid); + + @Select("select parameterValue from sys_parameter where parameterNo = #{parNo}") + String fetchByParNo(String parNo); + + @Select("select * from sys_parameter where parameterNo = #{parNo} and isDelete = 0") + SysParameter fetchOneByParNo(String parNo); + + int selectParameterByNo(String pNo); + + int selectAllByIdAndpNo(@Param("pNo") String pNo, @Param("sid") String sid); +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.xml new file mode 100644 index 0000000000..bcdb2c5882 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.xml @@ -0,0 +1,35 @@ + + + + + update sys_parameter + set isDelete = 1 + where sid = #{sid} + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java new file mode 100644 index 0000000000..70800809ff --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java @@ -0,0 +1,74 @@ +package com.yxt.anrui.portal.biz.sysparameter; + + +import com.yxt.anrui.portal.api.sysparameter.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Api(tags = "风控（财务）参数") +@RestController +@RequestMapping("v1/sysparameter") +public class SysParameterRest implements SysParameterFeign { + + @Autowired + private SysParameterService parameterService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = parameterService.listPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveOrUpdateParameter(SysParameterDto dto) { + return parameterService.saveOrUpdateParameter(dto); + } + + @Override + public ResultBean deleteBySids(String[] sids) { + return parameterService.deleteBySids(sids); + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return parameterService.fetchDetailsBySid(sid); + } + + @Override + public ResultBean fetchByParNo(String parNo) { + return parameterService.fetchByParNo(parNo); + } + + @Override + public ResultBean fetchOneByParNo(String parNo) { + return parameterService.fetchOneByParNo(parNo); + } + + @Override + public ResultBean> finListPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = parameterService.finListPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean finSaveParameter(SysParameterDto dto) { + return parameterService.finSaveParameter(dto); + } + + @Override + public ResultBean fetchFinDetailsBySid(String sid) { + return parameterService.fetchFinDetailsBySid(sid); + } +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java new file mode 100644 index 0000000000..a82cf2d9af --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java @@ -0,0 +1,310 @@ +package com.yxt.anrui.portal.biz.sysparameter; + +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.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysparameter.*; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.anrui.portal.biz.sysuser.SysUserService; +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.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Service +public class SysParameterService extends MybatisBaseService { + + @Autowired + private SysUserService sysUserService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysOrganizationService sysOrganizationService; + + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + SysParameterQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserService.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + //参数编码 + if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) { + qw.like("parameterNo", pagerQuery.getParameterNo()); + } + //参数名称 + if (StringUtils.isNotBlank(pagerQuery.getParameterName())) { + qw.like("parameterName", pagerQuery.getParameterName()); + } + qw.eq("isDelete", 0); + qw.eq("state", 0); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + /** + * 根据风控参数编码查询是否存在与风控参数编码相同的数据 + * + * @return + */ + public int selectParameterByNo(String pNo) { + return baseMapper.selectParameterByNo(pNo); + } + + /** + * 修改时 根据风控参数编码查询是否存在与风控参数编码相同的数据 + * + * @param pNo 风控参数编码 + * @param sid 风控参数sid + */ + public int selectAllByIdAndpNo(String pNo, String sid) { + return baseMapper.selectAllByIdAndpNo(pNo, sid); + } + + + public ResultBean saveOrUpdateParameter(SysParameterDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(dto.getParameterNo())) { + return rb.setMsg("参数编码不能为空！"); + } + if (StringUtils.isNotBlank(dto.getSid())) { + int count = selectAllByIdAndpNo(dto.getParameterNo(), dto.getSid()); + if (count > 0) { + return ResultBean.fireFail().setMessage("参数编码已存在"); + } + SysParameter loanParameter = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); + baseMapper.updateById(loanParameter); + } else { + int count = selectParameterByNo(dto.getParameterNo()); + if (count > 0) { + return ResultBean.fireFail().setMsg("添加失败，参数编码已存在"); + } + SysParameter loanParameter = new SysParameter(); + BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); + loanParameter.setOrgSidPath(dto.getOrgPath()); + loanParameter.setCreateBySid(dto.getUserSid()); + ResultBean orgSidByPath = sysStaffOrgService.getOrgSidByPath(dto.getOrgPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + loanParameter.setUseOrgSid(userOrgSid); + SysOrganization organizationVo = sysOrganizationService.fetchBySid(userOrgSid); + if (null != organizationVo) { + loanParameter.setUseOrgName(organizationVo.getName()); + } + } + loanParameter.setState(0); + baseMapper.insert(loanParameter); + } + return rb.success(); + } + + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + int count = baseMapper.updateBySidDelete(sid); + if (count == 0) { + return rb.setMsg("删除失败"); + } + } + return ResultBean.fireSuccess().setMsg("删除成功"); + } + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysParameterDetailsVo vo = new SysParameterDetailsVo(); + SysParameter loanParameter = fetchBySid(sid); + BeanUtil.copyProperties(loanParameter, vo); + vo.setUserSid(loanParameter.getCreateBySid()); + vo.setOrgPath(loanParameter.getOrgSidPath()); + return rb.success().setData(vo); + } + + public ResultBean fetchByParNo(String parNo) { + ResultBean rb = ResultBean.fireFail(); + String parameterValue = baseMapper.fetchByParNo(parNo); + return rb.success().setData(parameterValue); + } + + public ResultBean fetchOneByParNo(String parNo) { + ResultBean rb = ResultBean.fireFail(); + SysParameter parameter = baseMapper.fetchOneByParNo(parNo); + return rb.success().setData(parameter); + } + + public PagerVo finListPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + SysParameterQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserService.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + //参数编码 + if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) { + qw.like("parameterNo", pagerQuery.getParameterNo()); + } + //参数名称 + if (StringUtils.isNotBlank(pagerQuery.getParameterName())) { + qw.like("parameterName", pagerQuery.getParameterName()); + } + qw.eq("isDelete", 0); + qw.eq("state", 1); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean finSaveParameter(SysParameterDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(dto.getParameterNo())) { + return rb.setMsg("参数编码不能为空！"); + } + String useOrgSid = ""; + String useOrgName = ""; + if (!dto.getUseOrgSids().isEmpty()) { + useOrgSid = String.join(",", dto.getUseOrgSids()); + } + if (!dto.getUseOrgNames().isEmpty()) { + useOrgName = String.join(",", dto.getUseOrgNames()); + } + if (StringUtils.isNotBlank(dto.getSid())) { + int count = selectAllByIdAndpNo(dto.getParameterNo(), dto.getSid()); + if (count > 0) { + return ResultBean.fireFail().setMessage("参数编码已存在"); + } + SysParameter loanParameter = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); + loanParameter.setUseOrgSid(useOrgSid); + loanParameter.setUseOrgName(useOrgName); + baseMapper.updateById(loanParameter); + } else { + int count = selectParameterByNo(dto.getParameterNo()); + if (count > 0) { + return ResultBean.fireFail().setMsg("添加失败，参数编码已存在"); + } + SysParameter parameter = new SysParameter(); + BeanUtil.copyProperties(dto, parameter, "id", "sid"); + parameter.setOrgSidPath(dto.getOrgPath()); + parameter.setCreateBySid(dto.getUserSid()); + parameter.setUseOrgSid(useOrgSid); + parameter.setUseOrgName(useOrgName); + parameter.setState(1); + baseMapper.insert(parameter); + } + return rb.success(); + } + + public ResultBean fetchFinDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysParameterDetailsVo vo = new SysParameterDetailsVo(); + SysParameter loanParameter = fetchBySid(sid); + BeanUtil.copyProperties(loanParameter, vo); + vo.setUserSid(loanParameter.getCreateBySid()); + vo.setOrgPath(loanParameter.getOrgSidPath()); + if (StringUtils.isNotBlank(loanParameter.getUseOrgSid())) { + List userOrgSid = Arrays.stream(loanParameter.getUseOrgSid().split(",")).collect(Collectors.toList()); + vo.setUseOrgSids(userOrgSid); + } + if (StringUtils.isNotBlank(loanParameter.getUseOrgName())) { + List userOrgName = Arrays.stream(loanParameter.getUseOrgSid().split(",")).collect(Collectors.toList()); + vo.setUseOrgNames(userOrgName); + } + return rb.success().setData(vo); + } +} 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