优化

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

@@ -1729,12 +1729,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         bigAdd = bigAdd.add(loanSolutionsDetail.getBondAmounts());
                     }
                     if(loanSolutions.getFactoryDiscount() != null){
-                        bigAdd = bigAdd.add(loanSolutions.getFactoryDiscount());
+                        bigAdd = bigAdd.add(loanSolutions.getActualDiscount());
                     }
 
                     if(loanSolutionsOtherpolicy != null){
                         if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
-                            bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherDiscount());
+                            bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
                         }
                     }
 
@@ -1770,9 +1770,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
                                 loanDiffDetailssDto.setRealityLoan(finSelectedReceivablesDetailed.getSubscriptionMoney());
                                 loanDiffDetailssDto.setDiffLoan(decimalAll);
-                                loanDiffDetailssDto.setMakeDiscount(loanSolutions.getFactoryDiscount());
+                                loanDiffDetailssDto.setMakeDiscount(loanSolutions.getActualDiscount());
                                 loanDiffDetailssDto.setMakeLoanMargin(loanSolutions.getBondAmount());
-                                loanDiffDetailssDto.setMakeOtherDiscount(loanSolutionsOtherpolicy.getOtherDiscount());
+                                loanDiffDetailssDto.setMakeOtherDiscount(loanSolutionsOtherpolicy.getOtherActualDiscount());
                                 loanDiffDetailssDto.setReceivedPremium(loanSolutionsDetail.getProxyAccidentPremium());
                                 loanDiffDetailssDto.setVinNo(busSalesOrderVehicle.getLinkNo());
                                 loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());