Merge remote-tracking branch 'origin/master'

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

@@ -4436,7 +4436,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                        CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
                        voucherDetails.add(d);
                    }
-                   //推送间还待转付列表
+                   //推送间还待转付列表--若回购则推送已转付的间还还款记录、若不是回购则间还待转付列表。
                    if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
                        if (null != planDetails) {
                            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购

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

@@ -952,7 +952,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 baseMapper.updateBus(loanSettleApply.getBusVinSid(), "3");
                 //获取公司减免情况
                 BigDecimal amountTo = BigDecimal.ZERO;
-                /*if (loanSettleApply.getTrueReduction() == 1) {
+                if (loanSettleApply.getTrueReduction() == 1) {
                     LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
                     if (null != reduction) {
                         if (null != reduction.getAmountTo()) {
@@ -962,16 +962,17 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 } else {
                     LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
                     if (null != loanSettleCompanyCost) {
-                        if (null != loanSettleCompanyCost.getSettleAll()) {
-                            amountTo = loanSettleCompanyCost.getSettleAll();
+                        if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){//回购
+                            if(loanSettleCompanyCost.getSettleAll2() != null){
+                                amountTo = loanSettleCompanyCost.getSettleAll2();
+                            }
+
+                        }else{
+                            if (null != loanSettleCompanyCost.getSettleAll()) {
+                                amountTo = loanSettleCompanyCost.getSettleAll();
+                            }
                         }
                     }
-                }*/
-                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-                if (null != reduction) {
-                    if (null != reduction.getAmountTo()) {
-                        amountTo = reduction.getAmountTo();
-                    }
                 }
                 //生成结清应收
                 pushNewUnLists(loanSettleApply);
@@ -3791,7 +3792,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         sumMoney = jrMoney.add(dueMoney);
         //获取公司减免情况
         BigDecimal amountTo = BigDecimal.ZERO;
-        /*if (loanSettleApply.getTrueReduction() == 1) {
+        if (loanSettleApply.getTrueReduction() == 1) {
             LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
             if (null != reduction) {
                 if (null != reduction.getAmountTo()) {
@@ -3801,16 +3802,17 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         } else {
             LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
             if (null != loanSettleCompanyCost) {
-                if (null != loanSettleCompanyCost.getSettleAll()) {
-                    amountTo = loanSettleCompanyCost.getSettleAll();
+                if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){//回购
+                    if(loanSettleCompanyCost.getSettleAll2() != null){
+                        amountTo = loanSettleCompanyCost.getSettleAll2();
+                    }
+
+                }else{
+                    if (null != loanSettleCompanyCost.getSettleAll()) {
+                        amountTo = loanSettleCompanyCost.getSettleAll();
+                    }
                 }
             }
-        }*/
-        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
-        if (null != reduction) {
-            if (null != reduction.getAmountTo()) {
-                amountTo = reduction.getAmountTo();
-            }
         }
         if (sumMoney.compareTo(amountTo) < 0) {
             isSettle = true;