优化

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

@@ -512,9 +512,11 @@
         select distinct bo.sid
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+        left join anrui_riskcenter.loan_solutions lo on lo.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and bo.financePlan = '2'
+           <!-- and bo.financePlan = '2'-->
+            and (lo.typeKey = '01' or lo.typeKey = '02')
             and length(bv.linkSid)>0
         </where>
     </select>

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

@@ -688,7 +688,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         ResultBean rb = ResultBean.fireFail();
         //查詢是否有金融方案
         LoanSolutions loanSolutions = baseMapper.selectByApplySid(dto.getBusSid());
-        if(dto.isShowMore()){
+        if (dto.isShowMore()) {
             String mainVehicleAmount = dto.getMainVehicleAmount();
             if (StringUtils.isBlank(mainVehicleAmount)) {
                 return rb.setMsg("主车发票价不能为空");
@@ -756,14 +756,24 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (StringUtils.isBlank(loanPeriod)) {
                 return rb.setMsg("主方案期数不能为空");
             }
+            if (StringUtils.isBlank(dto.getPolicySid())) {
+                return rb.setMsg("产品政策不能为空");
+            }
             if (loanSolutions != null) {
                 baseMapper.deleteByOrderSid(dto.getBusSid());
                 loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
                 loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
             }
-
             //保存金融方案
             loanSolutions = new LoanSolutions();
+            //根据产品政策查询是否是自营非担保
+            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(dto.getPolicySid());
+            if (loanFinPolicy != null) {
+                if ("02".equals(loanFinPolicy.getGuaranteeTypeKey())) {//非担保
+                    loanSolutions.setTypeKey("01");
+                    loanSolutions.setType("自营非担保");
+                }
+            }
             loanSolutions.setSaleOrderState(1);
             if (StringUtils.isNotBlank(dto.getBusSid())) {
                 loanSolutions.setSalesOrderSid(dto.getBusSid());
@@ -930,7 +940,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetail.setNominalPrice(StringUtils.isNotBlank(nominalPrice) ? new BigDecimal(nominalPrice) : BigDecimal.ZERO);
             loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
             loanSolutionsDetailService.insert(loanSolutionsDetail);
-        }else{
+        } else {
             if (loanSolutions != null) {
                 baseMapper.deleteByOrderSid(dto.getBusSid());
                 loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
@@ -942,12 +952,14 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (StringUtils.isNotBlank(policyName)) {
                 loanSolutions.setPolicyName(policyName);
             }
+            loanSolutions.setType("外部金融");
+            loanSolutions.setTypeKey("02");
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
                 loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             } else {
                 loanSolutions.setFactoryDiscount(new BigDecimal(dto.getFactoryDiscount()));
             }
-            loanSolutions.setDiscountCar(StringUtils.isNotBlank(dto.getDiscountCar())?new BigDecimal(dto.getDiscountCar()):BigDecimal.ZERO);
+            loanSolutions.setDiscountCar(StringUtils.isNotBlank(dto.getDiscountCar()) ? new BigDecimal(dto.getDiscountCar()) : BigDecimal.ZERO);
             loanSolutions.setFactoryDiscountUse(dto.getFactoryDiscountUse());
             LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
             if (StringUtils.isNotBlank(dto.getServiceAmount())) {
@@ -992,7 +1004,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融
                 if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
-                    solutionsDetailsVo.setShowMore(false);
+                    if (loanSolutions != null) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionsDetailsVo.setShowMore(false);
+                        } else {
+                            solutionsDetailsVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionsDetailsVo.setShowMore(false);
+                    }
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionsDetailsVo.setShowMore(true);
                 }
@@ -1030,7 +1050,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融
                 if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
-                    solutionsDetailsVo.setShowMore(false);
+                    if (loanSolutions != null) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionsDetailsVo.setShowMore(false);
+                        } else {
+                            solutionsDetailsVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionsDetailsVo.setShowMore(false);
+                    }
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionsDetailsVo.setShowMore(true);
                 }
@@ -1498,8 +1526,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融
                 if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) {
-                    solutionssVo.setShowMore(false);
                     solutionssVo.setFactoryDiscountUse("抵车款");
+                    if (isTrue) {
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            solutionssVo.setShowMore(false);
+                        } else {
+                            solutionssVo.setShowMore(true);
+                        }
+                    } else {
+                        solutionssVo.setShowMore(false);
+                    }
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionssVo.setShowMore(true);
                     solutionssVo.setFactoryDiscountUse("抵利息");
@@ -1513,7 +1549,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                                 solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
                                 solutionssVo.setOtherPolicyIsMain(true);
                             }
-                        }else{
+                        } else {
                             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
                             if (loanFinOtherPolicy != null) {
                                 solutionssVo.setOtherPolicyIsMain(true);