全款业务中三方金融如果为自营非担保或外部金融存在厂家贴息的，需要金融部审批

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -162,6 +162,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -3977,11 +3978,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         appMap.put("saleOrderSid", busSalesOrder.getSid());
         variables.put("app", appMap);
         //是否是全款
-        if (BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())) {//全款
+        if (BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())) {
+            //全款
             if (BusSalesOrderConstantUtils.FinancePlanenum.PURCHASETYPEUP_ONE.getCode().equals(busSalesOrder.getFinancePlan())) {
+                //自由资金
                 variables.put(BusSalesOrderConstantUtils.IS_LOAN, true);
             } else {
-                variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
+                //三方金融
+                //查询是外部金融还是自用非担保，如果是外部金融的话，厂家贴息为0时，不走金融审批
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid());
+                if(solutionsDetailsVoResultBean.getData() != null){
+                    SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+                    if("02".equals(solutionsDetailsVo.getTypeKey())){
+                        if(new BigDecimal(BigInteger.ZERO).compareTo(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())) == 0){
+                            variables.put(BusSalesOrderConstantUtils.IS_LOAN, true);
+                        }else{
+                            variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
+                        }
+                    }else{
+                        variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
+                    }
+                }else{
+                    variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
+                }
             }
         } else {
             variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);

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

@@ -222,7 +222,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String factoryDiscount = dto.getFactoryDiscount();
             if (StringUtils.isNotBlank(factoryDiscount)) {
                 loanSolutions.setFactoryDiscount(new BigDecimal(factoryDiscount));
-            }else{
+            } else {
                 loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             }
             //年利率
@@ -438,6 +438,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //查询金融方案
             loanSolutions = new LoanSolutions();
             BeanUtil.copyProperties(dto, loanSolutions);
+            if (StringUtils.isBlank(dto.getFactoryDiscount())) {
+                loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
+            }
             baseMapper.insert(loanSolutions);
         }
         return rb.success();