Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java

@@ -54,5 +54,7 @@ public class CollectionVoucher {
         public BigDecimal balance;
         @ApiModelProperty("减数适用于结清时计算差额")
         public BigDecimal subtrahend;
+
+        public Integer repoState;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -5363,9 +5363,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
                         voucherResultDetailDtoDf3.setSummary(customerNumber+"扣回车辆再次销售-资方结清费用");
-                        DictCommonVo dictCommonVo2 = dictCommonFeign.selectBykey(planDetails.getBankName(), "investorsCode").getData();
+                        if("1".equals(busSalesOrderVehicle.getRepoState())){//已回购
-                        if (null != dictCommonVo2) {
+                            voucherResultDetailDtoDf3.setSubjectNo("1201.03.01");
-                            voucherResultDetailDtoDf3.setSubjectNo(dictCommonVo.getDictValue());
+                        }else{
+                            DictCommonVo dictCommonVo2 = dictCommonFeign.selectBykey(planDetails.getBankName(), "investorsCode").getData();
+                            if (null != dictCommonVo2) {
+                                voucherResultDetailDtoDf3.setSubjectNo(dictCommonVo.getDictValue());
+                            }
                         }
                         //核算部门
                         voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
@@ -6669,6 +6673,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                     voucherDetail.setCustomerCode(customerNumber);
                     voucherDetail.setCustomerName(customerName);
+                    voucherDetail.setRepoState(busSalesOrderVehicle.getRepoState());
                 }
                 try {
                     voucherDetail.setDataTime(sdf.parse(collectionDate));

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -1436,7 +1436,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("结清名义价款");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@@ -1456,7 +1460,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-合同违约金");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@@ -1476,7 +1484,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-资方其他费用");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java

@@ -80,6 +80,8 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService;
 import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
@@ -90,6 +92,8 @@ import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialS
 import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
@@ -172,6 +176,10 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 	private BasePurchaseSystemFeign basePurchaseSystemFeign;
 	@Autowired
 	private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+	@Autowired
+	private LoanRepurchaseApplyService loanRepurchaseApplyService;
+	@Autowired
+	private LoanRepurchaseCostService loanRepurchaseCostService;
 	
 	public PagerVo<LoanCaseCloseApplyVo> listPageVo(PagerQuery<LoanCaseCloseApplyQuery> pq) {
 		LoanCaseCloseApplyQuery query = pq.getParams();
@@ -513,7 +521,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 						//TOdO:
 						pushRiskToFin(bv.getBusinessSid());
 						//修改风控状态为执行
-						//--更新销售订单车辆表的风控状态为执行
+						//--更新销售订单车辆表的风控状态为结案
 						List<String> zxjaBusVinSidList = new ArrayList<>();
 						List<String> ssjaBusVinSidList = new ArrayList<>();
 						List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseCloseApply.getBusSid());
@@ -664,8 +672,33 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
 					zjzyfMoney = zjzyfMoney.add(new BigDecimal(StringUtils.isBlank(zjzyf)?"0":zjzyf));
 					//应收贷款车欠款_待处理欠款_待执行-（当前欠款合计-预申请坏账金额）
 					BigDecimal all = BigDecimal.ZERO;
+					if("1".equals(busSalesOrderVehicle.getRepoState().toString())) {//已回购
+						//查询回购的资方费用
+						LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+						if (loanRepurchaseApply != null) {
+							LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+							if (loanRepurchaseCost != null) {
+								//合同违约金
+								BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+								if (bankContractLiquidated != null) {
+									all = all.add(bankContractLiquidated);
+								}
+								//资方名义价
+								BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+								if (bankNominalPrice != null) {
+									all = all.add(bankNominalPrice);
+								}
+								//资方其他费用
+								BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+								if (bankOtherReceivable != null) {
+									all = all.add(bankOtherReceivable);
+								}
+							}
+						}
+					}
 					//预申请坏账金额
 					BigDecimal ysqhz = BigDecimal.ZERO;
+					//诉讼费
 					BigDecimal ssf = BigDecimal.ZERO;
 
 					BigDecimal fxMoney = BigDecimal.ZERO;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java

@@ -70,6 +70,8 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
 import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
 import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@@ -77,6 +79,8 @@ import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialS
 import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
@@ -139,6 +143,10 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
     private LoanRestoreReportApplyService loanRestoreReportApplyService;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanCaseExecuteApplyVo> listPageVo(PagerQuery<LoanCaseExecuteApplyQuery> pq) {
         LoanCaseExecuteApplyQuery query = pq.getParams();
@@ -508,27 +516,29 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
-                BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
-                if(busVinSidList.isEmpty()){
-                    busVinStateSetQuery.setState(12);//执行
-                    busVinStateSetQuery.setBusVinSidList(busVinSidList);
-                    ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
-                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
                     ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
                             0L, TimeUnit.MILLISECONDS,
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
+                    LoanCaseExecuteApply finalLoanCaseExecuteApply = loanCaseExecuteApply;
                     Future future1 = pool.submit(() -> {
                         //推送财务凭证
                         //TOdO:
                         pushRiskToFin(bv.getBusinessSid());
+                        List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseExecuteApply.getBusSid());
+                        BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
+                        if(busVinSidList.isEmpty()){
+                            busVinStateSetQuery.setState(12);//执行
+                            busVinStateSetQuery.setBusVinSidList(busVinSidList);
+                            ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                        }
                     });
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+
             } else {
                 //极光推送
                 loanCaseExecuteApply = fetchBySid(businessSid);
@@ -561,6 +571,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                 voucher.setVoucherNo(organizationVo.getOrgCode());
             }
             List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
+            List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos2 = new ArrayList<>();
             SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
             List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
             BigDecimal executeAmountInArear= loanCaseExecuteApply.getExecuteAmountInArear();//其中执行欠款金额
@@ -648,54 +659,127 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
                 String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
                 String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
                 all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
+                if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                    //查询回购的资方费用
+                    LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                    if(loanRepurchaseApply != null){
+                        LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                        if(loanRepurchaseCost != null){
+                            //合同违约金
+                            BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                            if(bankContractLiquidated != null){
+                                all = all.add(bankContractLiquidated);
+                            }
+                            //资方名义价
+                            BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                            if(bankNominalPrice != null){
+                                all = all.add(bankNominalPrice);
+                            }
+                            //资方其他费用
+                            BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                            if(bankOtherReceivable != null){
+                                all = all.add(bankOtherReceivable);
+                            }
+                        }
+                    }
+                }
                 qzzxqk = executeAmountInArear;
                 ysqhz = all.subtract(qzzxqk);
-                //贷方
+                if("9".equals(busSalesOrderVehicle.getRiskState().toString())){
-                Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                    //贷方
-                //借方
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
-                Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+                    //借方
-                Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
-                //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
-                if (all.compareTo(BigDecimal.ZERO) > 0) {
+                    //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
-                    voucherResultDetailDtoDf.setSummary(customerNumber + "转执行");
+                    if (all.compareTo(BigDecimal.ZERO) > 0) {
-                    voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
+                        voucherResultDetailDtoDf.setSummary(customerNumber + "转执行");
-                    //核算部门
+                        voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
-                    voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算部门
-                    //核算客户
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
-                    voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        //核算客户
-                    voucherResultDetailDtoDf.setCredit(all.toString());
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
-                    voucherResultDetailDtos.add(voucherResultDetailDtoDf);
+                        voucherResultDetailDtoDf.setCredit(all.toString());
-                }
+                        voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
+                    }
 
-                //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
+                    //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
-                if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
+                    if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
-                    voucherResultDetailDtoJf.setSummary(customerNumber + "转执行");
+                        voucherResultDetailDtoJf.setSummary(customerNumber + "转执行");
-                    voucherResultDetailDtoJf.setSubjectNo("1911.05");
+                        voucherResultDetailDtoJf.setSubjectNo("1911.05");
-                    //核算部门
+                        //核算部门
-                    voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+                        voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
-                    //核算客户
+                        //核算客户
-                    voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-                    voucherResultDetailDtoJf.setDebit(ysqhz.toString());
+                        voucherResultDetailDtoJf.setDebit(ysqhz.toString());
-                    voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+                        voucherResultDetailDtos2.add(voucherResultDetailDtoJf);
-                }
+                    }
+
+                    //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
+                    if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
+                        voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行");
+                        voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
+                        //核算部门
+                        voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
+                        voucherResultDetailDtos2.add(voucherResultDetailDtoJf2);
+                    }
+
+                }else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){
+                    //贷方
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                    //借方
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+                    Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
+                    //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
+                    if (all.compareTo(BigDecimal.ZERO) > 0) {
+                        voucherResultDetailDtoDf.setSummary(customerNumber + "转执行");
+                        voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
+                        //核算部门
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf.setCredit(all.toString());
+                        voucherResultDetailDtos.add(voucherResultDetailDtoDf);
+                    }
 
-                //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
+                    //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额
-                if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
+                    if (ysqhz.compareTo(BigDecimal.ZERO) > 0) {
-                    voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行");
+                        voucherResultDetailDtoJf.setSummary(customerNumber + "转执行");
-                    voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
+                        voucherResultDetailDtoJf.setSubjectNo("1911.05");
-                    //核算部门
+                        //核算部门
-                    voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
+                        voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
-                    //核算客户
+                        //核算客户
-                    voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-                    voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
+                        voucherResultDetailDtoJf.setDebit(ysqhz.toString());
-                    voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
+                        voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+                    }
+
+                    //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额
+                    if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) {
+                        voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行");
+                        voucherResultDetailDtoJf2.setSubjectNo("1201.03.05");
+                        //核算部门
+                        voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJf2.setDebit(qzzxqk.toString());
+                        voucherResultDetailDtos.add(voucherResultDetailDtoJf2);
+                    }
                 }
             }
 
+
             if (!voucherResultDetailDtos.isEmpty()) {
                 voucher.setResultDetails(voucherResultDetailDtos);
                 finKingDeeFeign.saveVoucher(voucher);
             }
+            if (!voucherResultDetailDtos2.isEmpty()) {
+                voucher.setResultDetails(voucherResultDetailDtos2);
+                finKingDeeFeign.saveVoucher(voucher);
+            }
         }
 
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java

@@ -64,6 +64,8 @@ import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitVehVo;
 import com.yxt.anrui.riskcenter.api.loanlawsuitsubapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanlawsuitsubveh.LoanLawsuitSubVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanlawsuitsubveh.LoanLawsuitSubVehDto;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyCommonVo;
 import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@@ -72,6 +74,7 @@ import com.yxt.anrui.riskcenter.biz.loanlawsuitsubveh.LoanLawsuitSubVehService;
 import com.yxt.anrui.riskcenter.biz.loanlawsuitveh.LoanLawsuitVehService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loansettleapply.LoanSettleApplyService;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
 import com.yxt.common.core.result.ResultBean;
@@ -136,6 +139,8 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
 	private BasePurchaseSystemFeign basePurchaseSystemFeign;
 	@Autowired
 	private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+	@Autowired
+	private LoanRepurchaseCostService loanRepurchaseCostService;
 
 	public PagerVo<LoanLawsuitSubApplyVo> listPageVo(PagerQuery<LoanLawsuitSubApplyQuery> pq) {
 		LoanLawsuitSubApplyQuery query = pq.getParams();
@@ -587,6 +592,30 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
 					String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
 					String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
 					all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
+					if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+						//查询回购的资方费用
+						LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+						if(loanRepurchaseApply != null){
+							LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+							if(loanRepurchaseCost != null){
+								//合同违约金
+								BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+								if(bankContractLiquidated != null){
+									all = all.add(bankContractLiquidated);
+								}
+								//资方名义价
+								BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+								if(bankNominalPrice != null){
+									all = all.add(bankNominalPrice);
+								}
+								//资方其他费用
+								BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+								if(bankOtherReceivable != null){
+									all = all.add(bankOtherReceivable);
+								}
+							}
+						}
+					}
 					//贷方
 					Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
 					//借方
@@ -621,6 +650,30 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
 					BigDecimal bjMoney = BigDecimal.ZERO;
 					String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
 					lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+					if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+						//查询回购的资方费用
+						LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+						if(loanRepurchaseApply != null){
+							LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+							if(loanRepurchaseCost != null){
+								//合同违约金
+								BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+								if(bankContractLiquidated != null){
+									lqMoney = lqMoney.add(bankContractLiquidated);
+								}
+								//资方名义价
+								BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+								if(bankNominalPrice != null){
+									lqMoney = lqMoney.add(bankNominalPrice);
+								}
+								//资方其他费用
+								BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+								if(bankOtherReceivable != null){
+									lqMoney = lqMoney.add(bankOtherReceivable);
+								}
+							}
+						}
+					}
 					//未到期欠款
 					String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
 					wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
@@ -681,6 +734,30 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
 					String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
 					String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
 					all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
+					if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+						//查询回购的资方费用
+						LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+						if(loanRepurchaseApply != null){
+							LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+							if(loanRepurchaseCost != null){
+								//合同违约金
+								BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+								if(bankContractLiquidated != null){
+									all = all.add(bankContractLiquidated);
+								}
+								//资方名义价
+								BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+								if(bankNominalPrice != null){
+									all = all.add(bankNominalPrice);
+								}
+								//资方其他费用
+								BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+								if(bankOtherReceivable != null){
+									all = all.add(bankOtherReceivable);
+								}
+							}
+						}
+					}
 					//贷方
 					Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
 					//借方

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -46,6 +46,8 @@ import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundVinListVo;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
@@ -61,6 +63,8 @@ import com.yxt.anrui.riskcenter.biz.loanoutboundveh.LoanOutboundVehService;
 import com.yxt.anrui.riskcenter.biz.loanredemptionapply.LoanRedemptionApplyService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -142,6 +146,10 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
     private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
     @Autowired
     private LoanSecondarySalesCostService loanSecondarySalesCostService;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanOutboundApplyVo> listPage(PagerQuery<LoanOutboundApplyQuery> pq) {
         IPage<LoanOutboundApply> page = PagerUtil.queryToPage(pq);
@@ -945,6 +953,30 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
             BigDecimal zjzyfMoney = BigDecimal.ZERO;
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
@@ -1130,6 +1162,30 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
 
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = alrepaidAndArrVo.getUnexpiredMoney();
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java

@@ -49,4 +49,6 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
     BigDecimal selByBusVinSid(String busVinSid);
 
     FinManufacturerBank selectByAccountNumAndUseSid(@Param("accountNumber") String accountNumber, @Param("useOrgSid") String useOrgSid);
+
+    LoanRepurchaseApply selectByVinSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -229,4 +229,8 @@
         where bankAccount = #{bankAccount}
           and useOrgSid = #{useOrgSid}
     </select>
+
+    <select id="selectByVinSid" resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply">
+        select * from loan_repurchase_apply where busVinSid = #{sid} order by id desc limit 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -1500,4 +1500,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     public BigDecimal selByBusVinSid(String busVinSid) {
         return baseMapper.selByBusVinSid(busVinSid);
     }
+
+    public LoanRepurchaseApply selectByBusVinSid(String sid) {
+        return baseMapper.selectByVinSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -41,6 +41,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
@@ -51,6 +53,8 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.LoanSecondarySale
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.LoanSecondarySalesNotApplyPdfVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
 import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
@@ -128,6 +132,10 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanReturnInboundApplyVo> listPageVo(PagerQuery<LoanReturnInboundApplyQuery> pq) {
         LoanReturnInboundApplyQuery query = pq.getParams();
@@ -725,7 +733,27 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
             //查询回购的资方费用
-
+            LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+            if(loanRepurchaseApply != null){
+                LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                if(loanRepurchaseCost != null){
+                    //合同违约金
+                    BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                    if(bankContractLiquidated != null){
+                        lqMoney = lqMoney.add(bankContractLiquidated);
+                    }
+                    //资方名义价
+                    BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                    if(bankNominalPrice != null){
+                        lqMoney = lqMoney.add(bankNominalPrice);
+                    }
+                    //资方其他费用
+                    BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                    if(bankOtherReceivable != null){
+                        lqMoney = lqMoney.add(bankOtherReceivable);
+                    }
+                }
+            }
         }
         //未到期欠款
         String wdq = loanRepaymentPlanDetailsService.getWdq(loanReturnInboundApply.getBusVinSid());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

@@ -67,6 +67,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
@@ -78,6 +80,8 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -158,6 +162,10 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
         LoanSecondarySalesNotApplyQuery query = pq.getParams();
@@ -682,6 +690,30 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
             BigDecimal zjzyfMoney = BigDecimal.ZERO;
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -2401,7 +2401,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                                     if (finVo.getSubtrahend().compareTo(BigDecimal.ZERO) > 0) {
                                         Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
                                         voucherDetail.setSummary("贷款保证金抵结清款");
-                                        voucherDetail.setSubjectNo(bankCode);
+                                        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){
+                                            voucherDetail.setSubjectNo("1201.02.03");
+                                        }else{
+                                            voucherDetail.setSubjectNo(bankCode);
+                                        }
                                         voucherDetail.setDimensionDept(deptCode);
                                         voucherDetail.setDimensionCustom(customerNumber);
                                         voucherDetail.setCredit(finVo.getSubtrahend().toString());
@@ -2514,32 +2518,36 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 resultDetails.add(voucherDetail);
                 amountAll = amountAll.add(bzjKFCw);
             }
-            //资方结清款付款
+            if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
-            if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
+                //资方结清款付款
-                if (topping == 1) {
+                if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
-                    if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
+                    if (topping == 1) {
-                        Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
+                        if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
-                        voucherDetail1.setSummary(planDetails.getBankName() + "结清");
+                            Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
-                        voucherDetail1.setSubjectNo(bankCode);
+                            voucherDetail1.setSummary(planDetails.getBankName() + "结清");
-                        voucherDetail1.setDimensionDept(deptCode);
+                            voucherDetail1.setSubjectNo(bankCode);
-                        voucherDetail1.setDimensionCustom(customerNumber);
+                            voucherDetail1.setDimensionDept(deptCode);
-                        voucherDetail1.setDebit(bbjDDMoney.toString());
+                            voucherDetail1.setDimensionCustom(customerNumber);
-                        resultDetails.add(voucherDetail1);
+                            voucherDetail1.setDebit(bbjDDMoney.toString());
-                        Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                            resultDetails.add(voucherDetail1);
-                        String bankSid = loanSettleApply.getBankSid();
+                            Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
-                        LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
+                            String bankSid = loanSettleApply.getBankSid();
-                        if(loanFinBank != null){
+                            LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
-                            voucherDetail2.setBank(loanFinBank.getBankNo());
+                            if(loanFinBank != null){
+                                voucherDetail2.setBank(loanFinBank.getBankNo());
+                            }
+                            voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
+                            voucherDetail2.setSubjectNo("1009.01.00");
+                            voucherDetail2.setDimensionDept(deptCode);
+                            voucherDetail2.setDimensionCustom(customerNumber);
+                            voucherDetail2.setCredit(bbjDDMoney.toString());
+                            resultDetails.add(voucherDetail2);
                         }
-                        voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
-                        voucherDetail2.setSubjectNo("1009.01.00");
-                        voucherDetail2.setDimensionDept(deptCode);
-                        voucherDetail2.setDimensionCustom(customerNumber);
-                        voucherDetail2.setCredit(bbjDDMoney.toString());
-                        resultDetails.add(voucherDetail2);
                     }
                 }
+
             }
+
             //贷款保证金扣罚
             if (amountAll.compareTo(BigDecimal.ZERO) > 0) {
                 Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
@@ -4284,10 +4292,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
 //                    voucherDetail.setRelief(companyRelief);
 //                    voucherDetail.setNoRelief(noRelief);
                     voucherDetail.setPaymentCharges(shouxufeiCW);
-                    voucherDetails.add(voucherDetail);
+                    if("0".equals(busSalesOrderVehicle.getRepoState().toString())){
+                        voucherDetails.add(voucherDetail);
+                    }
+
                 }
-                paymentVoucher.setVoucherDetails(voucherDetails);
+                if(!voucherDetails.isEmpty()){
-                finKingDeeFeign.saveSettleBankVoucher(paymentVoucher);
+                    paymentVoucher.setVoucherDetails(voucherDetails);
+                    finKingDeeFeign.saveSettleBankVoucher(paymentVoucher);
+                }
+
             }
         }
 
@@ -4396,11 +4410,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     voucherDetail.setSubtrahend(bbjDDMoney);
                     voucherDetail.setBalance(sub.add(shouxufeiCW));
                     voucherDetail.setPaymentCharges(shouxufeiCW);
-                    voucherDetails.add(voucherDetail);
+                    if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
+                        voucherDetails.add(voucherDetail);
+                    }
+                }
+                if(!voucherDetails.isEmpty()){
+                    paymentVoucher.setVoucherDetails(voucherDetails);
+                    RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
+                    return rb.success().setData(rskVoucher);
                 }
-                paymentVoucher.setVoucherDetails(voucherDetails);
-                RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
-                return rb.success().setData(rskVoucher);
             }
         }
         return rb.success();