From 8e67f6ed14fe813065340d1df59f28dff685de39 Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 6 May 2025 10:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRedemptionApplyService.java | 54 +++++++++++-------- .../LoanRepaymentPlanDetailsMapper.java | 2 + .../LoanRepaymentPlanDetailsMapper.xml | 10 ++++ .../LoanRepaymentPlanDetailsService.java | 4 ++ 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java index c4278a58c4..956e531d61 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; -import com.yxt.anrui.base.common.enums.BillTypeEnum; -import com.yxt.anrui.base.common.utils.Rule; -import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -33,11 +33,6 @@ 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.api.sysuser.SysUserVo; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.*; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; -import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto; @@ -47,12 +42,8 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetails import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppVinListVo; import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*; import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh; -import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; -import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; -import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; -import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList; import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; @@ -93,14 +84,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -804,6 +787,31 @@ public class LoanRedemptionApplyService extends MybatisBaseService redemptionVinLists = loanRedemptionVehService.selByMainSid(businessSid); + FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR(); + finUncollectedReceivablesDetailedJR.setCreateByName(redemptionApply.getApplyName()); + finUncollectedReceivablesDetailedJR.setCreateBySid(redemptionApply.getCreateBySid()); + //查询销售订单信息 + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(redemptionVinLists.get(0).getBusVinSid()).getData(); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + finUncollectedReceivablesDetailedJR.setApplySid(redemptionApply.getSid()); + String planSid = loanRepaymentPlanDetailsService.selByBusVinSidMax(busSalesOrderVehicle.getSid()); + finUncollectedReceivablesDetailedJR.setBusSid(planSid); + finUncollectedReceivablesDetailedJR.setPayCostTitleKey("016"); + finUncollectedReceivablesDetailedJR.setPayCostTitleValue("收回车辆费用"); + finUncollectedReceivablesDetailedJR.setReveivableMoney(redemptionApply.getFees()); + finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(redemptionApply.getFees()); + finUncollectedReceivablesDetailedJR.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + finUncollectedReceivablesDetailedJR.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + finUncollectedReceivablesDetailedJR.setStaffUserSid(busSalesOrder.getCreateBySid()); + finUncollectedReceivablesDetailedJR.setStaffName(busSalesOrder.getStaffName()); + finUncollectedReceivablesDetailedJR.setStaffDeptSid(busSalesOrder.getOrgSid()); + finUncollectedReceivablesDetailedJR.setStaffDeptName(busSalesOrder.getOrgName()); + finUncollectedReceivablesDetailedJR.setUseOrgSid(redemptionApply.getUseOrgSid()); + finUncollectedReceivablesDetailedJR.setUseOrgName(redemptionApply.getUseOrgName()); + finUncollectedReceivablesDetailedJR.setOrgSidPath(redemptionApply.getOrgSidPath()); + finUncollectedReceivablesDetailedJR.setKxState("01"); + finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR); try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index 974bcaed98..158d866bbf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -113,4 +113,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper + + 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 ed250fd3b1..eeab374d28 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 @@ -391,4 +391,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService