Merge remote-tracking branch 'origin/master'

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

@@ -3882,17 +3882,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
                 //认资金占用费消减平台资金占用费
                 if (v.getReceivablesName().equals("资金占用费")) {
-                    FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
+//                    FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
-                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(jr.getBusSid()).getData();
+//                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(jr.getBusSid()).getData();
-                    if (planDetails != null) {
+//                    if (planDetails != null) {
-                        if (planDetails.getFund() != null) {
+//                        if (planDetails.getFund() != null) {
-                            BigDecimal fund = planDetails.getFund();
+//                            BigDecimal fund = planDetails.getFund();
-                            String subscriptionMoney = v.getSubscriptionMoney();
+//                            String subscriptionMoney = v.getSubscriptionMoney();
-                            BigDecimal subtract = fund.subtract(new BigDecimal(subscriptionMoney));
+//                            BigDecimal subtract = fund.subtract(new BigDecimal(subscriptionMoney));
-                            planDetails.setFund(subtract);
+//                            planDetails.setFund(subtract);
-                            loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+//                            loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
-                        }
+//                        }
-                    }
+//                    }
                     try {
                         ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                                 .setNameFormat("demo-pool-%d").build();