完善结清管理推其他费用应收

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

@@ -789,6 +789,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         List<FinUncollectedReceivablesDetailedJR> updateList = new ArrayList<>();
         //资方逾期利息应收、名义价应收、合同违约金应收、其他费用应收
         LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
+        LoanSettleCompanyReduction companyReduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
         LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
         String scheduleSid = planDetails.getScheduleSid();
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
@@ -868,18 +869,28 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 list.add(jr);
             }
         }
+        BigDecimal otherAmount = BigDecimal.ZERO;
+        BigDecimal otherAmountJM = BigDecimal.ZERO;
+        BigDecimal otherAmountMoney = BigDecimal.ZERO;
+        if (null != loanSettleCompanyCost.getCompanyOtherPrice()) {
+            otherAmount = loanSettleCompanyCost.getCompanyOtherPrice();
+        }
+        if (null != companyReduction) {
+            if (null != companyReduction.getOtherCost()) {
+                otherAmountJM = companyReduction.getOtherCost();
+            }
+        }
+        otherAmountMoney = otherAmount.subtract(otherAmountJM);
         FinUncollectedReceivablesDetailedJR jr4 = finUncollectedReceivablesDetailedJRFeign.getUnJrByPayCostTitleKeyAndBusSid("011", planDetailsSid).getData();
         if (null != jr4) {
-            if (null != loanSettleCompanyCost.getContractLiquidated()) {
-                jr4.setReveivableMoney(loanSettleCompanyCost.getContractLiquidated());
+                jr4.setReveivableMoney(otherAmountMoney);
                 updateList.add(jr4);
-            }
         } else {
-            if (loanSettleCompanyCost.getCompanyOtherPrice().compareTo(BigDecimal.ZERO) > 0) {
+            if (otherAmountMoney.compareTo(BigDecimal.ZERO) > 0) {
                 //公司其他费用应收
                 FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                 jr.setBusSid(planDetails.getSid());
-                jr.setReveivableMoney(loanSettleCompanyCost.getCompanyOtherPrice());
+                jr.setReveivableMoney(otherAmountMoney);
                 jr.setPayCostTitleKey("011");
                 jr.setPayCostTitleValue("其他费用");
                 jr.setOrgSidPath(planDetails.getOrgSidPath());