推送业务的应收未收的融资放款调整

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -485,13 +485,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             //留购价
-                            if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
+                           /* if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
                                 CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
                                 creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
-                            }
+                            }*/
                         }
                         creditResult.setResultDetails(collectionDetailDtoListOne);
                         finKingDeeFeign.pushOtherReceivableBill(creditResult);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -2725,6 +2725,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；
         // 差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
         BigDecimal bg = BigDecimal.ZERO;
+        BigDecimal zer = BigDecimal.ZERO;
         LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
         if (loanSolutions != null) {
             //根据产品政策sid查询
@@ -2741,22 +2742,27 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
                     if (loanSolutionsDetail != null) {
                         if (loanSolutionsDetail.getBondAmounts() != null) {
-                            bg = bg.subtract(loanSolutionsDetail.getBondAmounts());
+                            zer = zer.add(loanSolutionsDetail.getBondAmounts());
                         }
                     }
                 }
                 if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {
-                    BigDecimal zer = BigDecimal.ZERO;
                     if (loanSolutions.getFactoryDiscount() != null) {
-                        bg = bg.subtract(loanSolutions.getFactoryDiscount());
+//                        bg = bg.subtract(loanSolutions.getFactoryDiscount());
                         zer = zer.add(loanSolutions.getFactoryDiscount());
                     }
                     if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
-                        bg = bg.subtract(loanSolutionsOtherpolicy.getOtherDiscount());
+//                        bg = bg.subtract(loanSolutionsOtherpolicy.getOtherDiscount());
                         zer = zer.add(loanSolutionsOtherpolicy.getOtherDiscount());
                     }
-                    pushVo.setOtherReceivableMoney(zer.toString());
                 }
+                LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+                if(loanSolutionsDetail != null){
+                    if(loanSolutionsDetail.getProxyAccidentPremium() != null){
+                        zer = zer.add(loanSolutionsDetail.getProxyAccidentPremium());
+                    }
+                }
+                pushVo.setOtherReceivableMoney(zer.toString());
             }
         }
         pushVo.setMoney(bg.toString());