From dc47d86f3641a630cb6c9642cebef9a07adb12d9 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 14 Dec 2023 17:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D=E8=AE=A4?= =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=9B=9E=E6=98=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmation.java | 28 +- .../FinCollectionConfirmationFeign.java | 17 + ...inCollectionConfirmationFeignFallback.java | 12 + .../rsk/FinCollectionConfirmationRskDto.java | 95 +++++ .../rsk/FinCollectionConfirmationRskVo.java | 83 ++++ .../FinSelectedReceivablesDetailedRsk.java | 37 ++ .../FinCollectionConfirmationRest.java | 12 + .../FinCollectionConfirmationService.java | 380 ++++++++++++++---- ...ncollectedReceivablesDetailedJRMapper.java | 1 - ...UncollectedReceivablesDetailedJRMapper.xml | 2 - ...collectedReceivablesDetailedJRService.java | 3 +- .../LoanRepaymentPlanDetails.java | 2 + .../LoanRepaymentPlanDetailsDto.java | 2 + .../LoanRepaymentPlanDetailsFeign.java | 6 + ...LoanRepaymentPlanDetailsFeignFallback.java | 5 + .../LoanRepaymentPlanDetailsRest.java | 6 + .../LoanRepaymentPlanDetailsService.java | 12 +- .../LoanRepaymentScheduleService.java | 34 ++ 18 files changed, 629 insertions(+), 108 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index ce85e313f8..38376c5367 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -52,33 +52,33 @@ import java.math.BigDecimal; public class FinCollectionConfirmation extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人") + @ApiModelProperty("创建人") private String createByName; // 创建人接口 - @ApiModelProperty("收款日期") + @ApiModelProperty("收款日期") private String collectionDate; // 收款日期 @ApiModelProperty("收款银行key") private String collectionBankKey; // 收款银行key - @ApiModelProperty("收款银行") + @ApiModelProperty("收款银行") private String collectionBank; // 收款银行 @ApiModelProperty("收款银行账号key") private String collectionBankNumKey; // 收款银行账号key - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String collectionBankNum; // 收款银行账号 - @ApiModelProperty("收款方式key") + @ApiModelProperty("收款方式key") private String collectionTypeKey; // 收款方式key - @ApiModelProperty("收款方式value") + @ApiModelProperty("收款方式value") private String collectionTypeValue; // 收款方式value - @ApiModelProperty("付款方名称") + @ApiModelProperty("付款方名称") private String payerName; // 付款方名称 - @ApiModelProperty("收款金额") + @ApiModelProperty("收款金额") private BigDecimal collectionMoney; // 收款金额 - @ApiModelProperty("打款凭证Url") + @ApiModelProperty("打款凭证Url") private String paymentVoucherUrl; // 打款凭证Url - @ApiModelProperty("汇款确认书Url") + @ApiModelProperty("汇款确认书Url") private String remittanceConfirmationUrl; // 汇款确认书Url - @ApiModelProperty("余额") + @ApiModelProperty("余额") private BigDecimal balance; // 余额 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") private Integer auditState; // 审核状态 @@ -93,7 +93,7 @@ public class FinCollectionConfirmation extends BaseEntity { private String busNo; @ApiModelProperty("是否是首次：0是，1不是") private int first; - + @ApiModelProperty("申请部门") private String createDept; @ApiModelProperty("申请日期") @@ -141,4 +141,6 @@ public class FinCollectionConfirmation extends BaseEntity { @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("款项来源（01销售认款、02金融认款）") + private String source; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 32ed6f3704..62010890af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -103,6 +105,21 @@ public interface FinCollectionConfirmationFeign { @PostMapping("/ctskd") @ResponseBody ResultBean ctskd(@RequestParam("skdSid") String skdSid); + + /*----------------------金融认款申请---------------------------*/ + + + @ApiOperation("金融认款申请提交新增保存") + @PostMapping("/saveRsk") + public ResultBean saveRsk(@RequestBody FinCollectionConfirmationRskDto dto); + + @ApiOperation("金融认款申请详情") + @GetMapping("/rskDetails/{sid}") + public ResultBean rskDetails(@PathVariable("sid") String sid); + + + + /*---------------------App接口 ---------------------*/ @ApiOperation("手机端—获取款项确认列表") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 73d472d146..5910adf841 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -103,6 +105,16 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf return null; } + @Override + public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { + return null; + } + + @Override + public ResultBean rskDetails(String sid) { + return null; + } + @Override public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java new file mode 100644 index 0000000000..89b6ea0775 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java @@ -0,0 +1,95 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk; + +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2023/12/14 9:05 + */ +@Data +public class FinCollectionConfirmationRskDto implements Dto { + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("sid") + private String sid; // 收款确认单sid + @ApiModelProperty("业务员sid") + private String staffSid; // 业务员sid + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("收款日期") + private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行key") + private String collectionBankKey; // 收款银行key + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号key") + private String collectionBankNumKey; // 收款银行账号key + @ApiModelProperty("收款银行账号") + private String collectionBankNum; // 收款银行账号 + @ApiModelProperty("收款方式key") + private String collectionTypeKey; // 收款方式key + @ApiModelProperty("收款方式value") + private String collectionTypeValue; // 收款方式value + @ApiModelProperty("付款方名称") + private String payerName; // 付款方名称 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请部门sid") + private String createDeptSid; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）") + private Integer paymentState; // 审核状态 + @ApiModelProperty("已选应收款项明细") + @Valid + private List finSelectedReceivablesDetaileds; // 已选应收款项明细 + @ApiModelProperty("打款凭证附件") + private List paymentVoucherAppendixs = new ArrayList<>(); // 打款凭证附件 + @ApiModelProperty("汇款确认书附件") + private List remittanceConfirmationAppendixs = new ArrayList<>(); // 汇款确认书附件 + @ApiModelProperty("打款凭证Url") + private String paymentVoucherUrl; // 打款凭证Url + @ApiModelProperty("汇款确认书Url") + private String remittanceConfirmationUrl; // 汇款确认书Url + /* @ApiModelProperty("余额") + private String balance;*/ +// @ApiModelProperty("分公司sid") +// private String useOrgSid; // 分公司sid +// @ApiModelProperty("销售专员名称") +// private String staffName; +// @ApiModelProperty("销售专员用户sid") +// private String staffUserSid; +// @ApiModelProperty("销售专员部门名称") +// private String staffDeptName; +// @ApiModelProperty("销售专员部门sid") +// private String staffDeptSid; +// @ApiModelProperty("组织全路径") +// private String orgSidPath; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java new file mode 100644 index 0000000000..c8abae5340 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java @@ -0,0 +1,83 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk; + +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2023/12/14 13:40 + */ +@Data +public class FinCollectionConfirmationRskVo implements Vo { + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("sid") + private String sid; // 收款确认单sid + @ApiModelProperty("业务员sid") + private String staffSid; // 业务员sid + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("收款日期") + private String collectionDate; // 收款日期 + @ApiModelProperty("收款银行key") + private String collectionBankKey; // 收款银行key + @ApiModelProperty("收款银行") + private String collectionBank; // 收款银行 + @ApiModelProperty("收款银行账号key") + private String collectionBankNumKey; // 收款银行账号key + @ApiModelProperty("收款银行账号") + private String collectionBankNum; // 收款银行账号 + @ApiModelProperty("收款方式key") + private String collectionTypeKey; // 收款方式key + @ApiModelProperty("收款方式value") + private String collectionTypeValue; // 收款方式value + @ApiModelProperty("付款方名称") + private String payerName; // 付款方名称 + @ApiModelProperty("收款金额") + private String collectionMoney; // 收款金额 + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty + private String reason; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请部门sid") + private String createDeptSid; + @ApiModelProperty("申请日期") + private String createDate; + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; + @ApiModelProperty("付款银行") + private String payBank; + @ApiModelProperty("收款银行账号sid") + private String accountSid; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）") + private Integer paymentState; // 审核状态 + @ApiModelProperty("已选应收款项明细") + @Valid + private List finSelectedReceivablesDetaileds; // 已选应收款项明细 + @ApiModelProperty("打款凭证附件") + private List paymentVoucherAppendixs = new ArrayList<>(); // 打款凭证附件 + @ApiModelProperty("汇款确认书附件") + private List remittanceConfirmationAppendixs = new ArrayList<>(); // 汇款确认书附件 + @ApiModelProperty("打款凭证Url") + private String paymentVoucherUrl; // 打款凭证Url + @ApiModelProperty("汇款确认书Url") + private String remittanceConfirmationUrl; // 汇款确认书Url +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java new file mode 100644 index 0000000000..00cae61909 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Fan + * @description + * @date 2023/12/14 9:14 + */ +@Data +public class FinSelectedReceivablesDetailedRsk { + //实收sid + private String sid; + @ApiModelProperty("应收未收款项sid") + private String receivablesSid; + @ApiModelProperty("消贷合同号") + private String loanContractNo; // 合同编号 + @ApiModelProperty("贷款人") + private String borrowerName; // 贷款人 + @ApiModelProperty("车架号/车牌号") + private String vinNo; // 车架号 + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("当前未收金额") + private String currentReceivableMoney; // 当前未收金额 + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("认款金额") + @NotBlank(message = "认款金额不能为空") + private String subscriptionMoney; // 认款金额 +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 40802f1039..4a473d8bce 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -125,6 +127,16 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean ctskd(String skdSid) { return finCollectionConfirmationService.ctskd(skdSid); } + //------------------------金融认款申请----------------------------------- + @Override + public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) { + return finCollectionConfirmationService.saveRsk(dto); + } + + @Override + public ResultBean rskDetails(String sid) { + return finCollectionConfirmationService.rskDetails(sid); + } /** * 手机端—获取款项确认列表 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index d9250f77a5..5454d0d66b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -29,14 +29,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; -import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; -import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; @@ -45,67 +41,36 @@ import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; -import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; -import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication; -import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign; -import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerFeign; -import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; -import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleFeign; -import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; -import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered; -import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; -import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; -import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling; -import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign; import com.yxt.anrui.crm.api.crmcustomertemp.*; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; -import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; -import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinSelectedReceivablesDetailedRsk; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult; import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT; -import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService; -import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; -import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService; -import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService; -import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; -import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService; +import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService; import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService; -import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService; 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.sysstafforg.SysStaffOrg; @@ -119,9 +84,9 @@ import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; import com.yxt.common.base.config.component.FileUploadComponent; @@ -142,7 +107,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -203,6 +167,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1007,7 +975,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getContractList(); - if(finSelectedReceivablesDetailedDtos.isEmpty()){ + if (finSelectedReceivablesDetailedDtos.isEmpty()) { return rb.setMsg("请添加认款信息"); } List dingList = finSelectedReceivablesDetailedDtos.stream() @@ -1608,7 +1576,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService voList = finSelectedReceivablesDetailedService.selectListByVin1(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); List unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid()); @@ -1622,7 +1590,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); List unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); @@ -1692,7 +1660,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finLi = finSelectedReceivablesDetailedService.selectLiBy(sid); finLi.removeAll(Collections.singleton(null)); - if(!finLi.isEmpty()){ + if (!finLi.isEmpty()) { LoanDiffsDto loanDiffsDto = new LoanDiffsDto(); loanDiffsDto.setCreateByName(confirmation.getCreateByName()); loanDiffsDto.setCreateBySid(confirmation.getCreateBySid()); @@ -1728,24 +1696,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService voList = finSelectedReceivablesDetailedService.selectListByVin2(finUncollectedReceivablesDetailed.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); List unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid2(finUncollectedReceivablesDetailed.getBusVinSid()); BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); - if(bigDecimalVinAll.compareTo(unDecimalVinAll) == 0){//认完 - if(bigAdd.compareTo(decimalAll) != 0){//不相等，推送放款差额确认待办 + if (bigDecimalVinAll.compareTo(unDecimalVinAll) == 0) {//认完 + if (bigAdd.compareTo(decimalAll) != 0) {//不相等，推送放款差额确认待办 LoanDiffDetailssDto loanDiffDetailssDto = new LoanDiffDetailssDto(); loanDiffDetailssDto.setBankSid(loanFinPolicy.getBankSid()); loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName()); @@ -1789,9 +1757,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData(); if (loanSolutions.getBondAmount() != null) {//贷款保证金 - if(loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0){ + if (loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0) { CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto(); creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode()); creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString()); creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType()); creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark()); - if(baseVehicle != null){ - String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8); + if (baseVehicle != null) { + String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8); creditResultDetailDto.setMaterialNo(vinNo); } collectionDetailDtoListOne.add(creditResultDetailDto); @@ -1847,13 +1815,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData(); if (loanSolutions.getBondAmount() != null) {//贷款保证金 - if(loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0){ + if (loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0) { CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto(); creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode()); creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString()); creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType()); creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark()); - if(baseVehicle != null){ + if (baseVehicle != null) { String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8); creditResultDetailDto.setMaterialNo(vinNo); } @@ -1974,13 +1942,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); + if (finSelectedReceivablesDetailedDtos.size() > 0) { + for (FinSelectedReceivablesDetailedRsk v : finSelectedReceivablesDetailedDtos) { + if (StringUtils.isBlank(v.getSubscriptionMoney())) { + return rb.setMsg("认款金额不允许为空"); + } + } + } + BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedRsk::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) { + return rb.setMsg("认款总额与收款金额不符"); + } + //打款凭证附件 + List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); + //汇款确认书附件 + List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); + List stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + List stringList1 = stringList.stream().distinct().collect(Collectors.toList()); + if (stringList.size() != stringList1.size()) { + return rb.setMsg("认款选择的数据存在问题，请检查是否重复"); + } + } + //根据用户sid查询分公司sid + String useOrgSid = ""; + if (StringUtils.isNotBlank(dto.getOrgPath())) { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + } + //对收款申请进行赋值操作 + FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); + BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); + finCollectionConfirmation.setSource("02"); +// if (StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())) { +// //收款 +// finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName()); +// finCollectionConfirmation.setStaffUserSid(dto.getUserSid()); +// finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept()); +// finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid()); +// String orgPath = dto.getOrgPath(); +// finCollectionConfirmation.setOrgSidPath(orgPath); +// ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); +// if (sysOrganizationVoResultBean.getData() != null) { +// finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); +// } +// } else + // { + //代收款 + String orgPath = dto.getOrgPath(); + finCollectionConfirmation.setOrgSidPath(orgPath); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (sysOrganizationVoResultBean.getData() != null) { + finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } +// List orgList = Arrays.asList(orgPath.split("/")); +// orgList.set(orgList.size() - 1, dto.getStaffDeptSid()); +// finCollectionConfirmation.setOrgSidPath(String.join("/", orgList)); + // } + sid = finCollectionConfirmation.getSid(); + finCollectionConfirmation.setCreateBySid(dto.getUserSid()); + finCollectionConfirmation.setUseOrgSid(useOrgSid); + //附件保存:打款凭证附件 + paymentVoucherAppendixs.stream().forEach(v -> { + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + BeanUtil.copyProperties(v, commonAppendixDto); + String s = commonAppendixDto.getFilePath(); + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); + commonAppendixDto.setFilePath(s); + commonAppendixDto.setCreateBySid(dto.getUserSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + }); + String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finCollectionConfirmation.setPaymentVoucherUrl(payFilePath); + //汇款确认书附件保存 + remittanceConfirmationAppendixs.stream().forEach(v -> { + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + BeanUtil.copyProperties(v, commonAppendixDto); + String s = commonAppendixDto.getFilePath(); + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid()); + commonAppendixDto.setFilePath(s); + commonAppendixDto.setCreateBySid(dto.getUserSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + }); + String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath); + if (finSelectedReceivablesDetailedDtos.size() > 0) { + //认款明细保存 + String finalSid = sid; + String finalUseOrgSid = useOrgSid; + finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选 + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); + // BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid"); + if (StringUtils.isNotBlank(v.getVinNo())) { + String[] splitVin = v.getVinNo().split("/"); + finSelectedReceivablesDetailed.setVIN(splitVin[0]); + } + if (StringUtils.isNotBlank(v.getReceivablesName())) { + finSelectedReceivablesDetailed.setReceivablesName(v.getReceivablesName()); + } + if (StringUtils.isNotBlank(v.getSubscriptionMoney())) { + finSelectedReceivablesDetailed.setSubscriptionMoney(new BigDecimal(v.getSubscriptionMoney())); + } + finSelectedReceivablesDetailed.setReceivablesSid(v.getReceivablesSid()); + finSelectedReceivablesDetailed.setCollSid(finalSid); + finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid); + finSelectedReceivablesDetailed.setPurchaseSystemSid(finCollectionConfirmation.getPurchaseSystemSid()); + finSelectedReceivablesDetailed.setPurchaseSystemName(finCollectionConfirmation.getPurchaseSystemName()); + //设置审核状态为待审核(1待审核/2已驳回/3已审核) + finSelectedReceivablesDetailed.setAuditState(1); + finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); + //认款日期默认为当天的日期 + finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); +// finSelectedReceivablesDetailed.setBalance(v.getSubscriptionMoney()); +// FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); +// finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName()); +// finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid()); +// finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid()); +// finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName()); + finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath()); + finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName()); + finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); +// if (v.getSubscribedOf() == 0) { +// //应收未收减去相应的认款 +// finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); +// BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); +// finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); +// finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); +// } + }); + } + finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney()); + finCollectionConfirmation.setAuditState(1); + //1未认款/2部分认款/3已认款 + finCollectionConfirmation.setPaymentState(1); + //添加单据编号 + String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid()); + finCollectionConfirmation.setBillNo(billNo); + baseMapper.insert(finCollectionConfirmation); + } + return rb.success().setMsg("添加成功"); + } + + public ResultBean rskDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinCollectionConfirmationRskVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationRskVo(); + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); + BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); + List paymentVoucherAppendixs = new ArrayList<>(); + List remittanceConfirmationAppendixs = new ArrayList<>(); + CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(sid); + //打款凭证附件 + commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + ResultBean> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo(); + //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo); + paymentVoucherAppendixs.add(paymentVoucherAppendixVo); + } + } + finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); + commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(sid); + //汇款确认书附件 + commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); + listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo(); + //commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo); + remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo); + } + } + finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs); + + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); + List rskList = new ArrayList<>(); + if (!finSelectedReceivablesDetailedVos.isEmpty()) { + finSelectedReceivablesDetailedVos.stream().forEach(v -> { + FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk(); + String receivablesSid = v.getReceivablesSid(); + if (v.getReceivablesName().equals("月还")) { + LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, rsk, "sid"); + if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { + rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); + } + } + } else { + FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid); + if (jr != null) { + String busSid = jr.getBusSid(); + LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, rsk, "sid"); + if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { + rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); + } + } + } + } + rsk.setReceivablesName(v.getReceivablesName()); + rsk.setSid(v.getSid()); + rsk.setSubscriptionMoney(v.getSubscriptionMoney()); + rsk.setReceivablesSid(v.getReceivablesSid()); + rskList.add(rsk); + }); + } + finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(rskList); + if (finCollectionConfirmation.getAuditState() == 2) { + String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason(); + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + } else if (finCollectionConfirmation.getAuditState() == 3) { + String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认"; + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + } + return rb.success().setData(finCollectionConfirmationDetailsVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java index 28d2f5d637..5f7f9e5766 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java @@ -65,7 +65,6 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper and CONCAT( p.vinNo, '/', p.vehMark ) like concat('%', #{vinNo}, '%') @@ -107,7 +106,6 @@ LEFT JOIN anrui_buscenter.bus_sales_order AS s ON p.salesOrderSid = s.sid where s.purchaseSystemSid = #{purchaseSystemSid} - AND s.createBySid = #{createBySid} AND s.useOrgSid = #{userOrgSid} and CONCAT( p.vinNo, '/', p.vehMark ) like concat('%', #{vinNo}, '%') diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java index aed0a4501a..f500370434 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java @@ -66,7 +66,7 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi String loanContractNo = query.getLoanContractNo(); String bankName = query.getBankName(); String receivablesName = query.getReceivablesName(); - String createBySid = query.getCreateBySid(); + // String createBySid = query.getCreateBySid(); String orgPath = query.getOrgPath(); String purchaseSystemSid = query.getPurchaseSystemSid(); ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); @@ -81,7 +81,6 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi loanContractNo, bankName, receivablesName, - createBySid, userOrgSid, purchaseSystemSid ); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java index 6614c9f5a6..938791b39c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java @@ -36,6 +36,8 @@ public class LoanRepaymentPlanDetails extends BaseEntity { private String busVinSid; @ApiModelProperty("车架号") private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; @ApiModelProperty("消贷合同编号") private String loanContractNo; @ApiModelProperty("消贷合同sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java index 6cd8dddb80..e246756b64 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java @@ -34,6 +34,8 @@ public class LoanRepaymentPlanDetailsDto implements Dto { private String busVinSid; @ApiModelProperty("车架号") private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; @ApiModelProperty("消贷合同编号") private String loanContractNo; @ApiModelProperty("消贷合同sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java index cf0d5c0711..7965a5540b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java @@ -37,4 +37,10 @@ public interface LoanRepaymentPlanDetailsFeign { @ApiOperation("月还明细") @DeleteMapping("/details") public ResultBean details(@RequestParam("saleVehSid") String saleVehSid); + + @ApiOperation("查询还款计划表明细") + @GetMapping("/fetchDetails") + @ResponseBody + public ResultBean fetchDetails(@RequestParam("sid") String sid); + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java index b908f59dd1..7a8a997af8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java @@ -31,4 +31,9 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD public ResultBean details(String saleVehSid) { return null; } + + @Override + public ResultBean fetchDetails(String sid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java index c38309597b..9d807417fc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails; @@ -41,4 +42,9 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei MonRepayDetails monRepayDetails = loanRepaymentPlanDetailsService.details(saleVehSid); return rb.success().setData(monRepayDetails); } + + @Override + public ResultBean fetchDetails(String sid) { + return loanRepaymentPlanDetailsService.fetchDetails(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 59d432e1cf..a629307b29 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -87,12 +87,12 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selPlanByNoAndPeriod(String bankContractNo,String period) { - return baseMapper.selPlanByNoAndPeriod(bankContractNo,period); + public List selPlanByNoAndPeriod(String bankContractNo, String period) { + return baseMapper.selPlanByNoAndPeriod(bankContractNo, period); } public String selBeMoney(String no, String period, String bankContractNo) { - return baseMapper.selBeMoney(no,period,bankContractNo); + return baseMapper.selBeMoney(no, period, bankContractNo); } public MonRepayDetails details(String saleVehSid) { @@ -101,4 +101,10 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService fetchDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanRepaymentPlanDetails planDetails = fetchBySid(sid); + return rb.success().setData(planDetails); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 89988d3c73..1ab1fba8a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -410,6 +410,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService