优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -135,6 +135,8 @@ public class AppBusSalesOrderVo implements Vo {
     private boolean showApplyBtn;
     @ApiModelProperty("是否显示录入车架号")
     private boolean showInputBtn;
+    @ApiModelProperty("是否显示贷款人确定按钮")
+    private boolean showBorrowBtn;
 
     private boolean showRePublishBtn;
     @ApiModelProperty("车型信息")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java

@@ -16,5 +16,10 @@ public class LoanOrderPreloanVo implements Vo {
     private String customerName;
     @ApiModelProperty("台数")
     private String quantity;
+    @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉")
+    private String confirmBtn;
+    @ApiModelProperty("页面地址")
+    private String pluginPage;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java

@@ -61,6 +61,8 @@ public class CalculateQuery {
     private String otherPolicyPeriod;
     @ApiModelProperty("其它融年利率")
     private String otherPolicyYearRatio;
+    @ApiModelProperty("其他融sid")
+    private String otherPolicySid;
 
 
     /*********************************金融方案费用明细*****************************/

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -22,7 +22,7 @@
     </select>
 
     <select id="getOrderLoanPagerList" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo">
-        select la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
+        select distinct(la.idCard),la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
         la.capitalName,
         lp.peoName
@@ -41,6 +41,7 @@
                 , '%')
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="judgeIsLoan" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -561,9 +561,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             if (StringUtils.isNotBlank(query.getIdCard())) {
                 qw.like("la.idCard", query.getIdCard());
             }
+            qw.eq("la.isDelete", 0);
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw,query.getName());
+        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());
         PagerVo<LoanPreloanVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -574,10 +575,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
         LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid);
         if (loanPreloanCreditApply == null) {
+            loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
             if (StringUtils.isNotBlank(loanPreloanCreditApply.getGsfkjgKey())) {
                 if (loanPreloanCreditApply.getState() != 2 && "001".equals(loanPreloanCreditApply.getGsfkjgKey())) {
+                    loanOrderPreloanVo.setConfirmBtn("我知道了");
                     return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
                 } else {
                     if ("002".equals(loanPreloanCreditApply.getGsfkjgKey())) {
@@ -587,9 +590,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                             if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
                                 return rb.success();
                             } else {
+                                loanOrderPreloanVo.setConfirmBtn("信用申诉");
                                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                             }
                         } else {
+                            loanOrderPreloanVo.setConfirmBtn("信用申诉");
                             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                         }
                     } else {
@@ -597,6 +602,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                     }
                 }
             } else {
+                loanOrderPreloanVo.setConfirmBtn("我知道了");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             }
         }

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

@@ -1356,6 +1356,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (StringUtils.isBlank(otherPolicyAmount)) {
                 return rb.setMsg("其他融贷款金额不能为空");
             }
+
             if (StringUtils.isBlank(otherPolicyPeriod)) {
                 otherPolicyPeriod = "0";
             }
@@ -1383,7 +1384,44 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
         downPayAmountsRatio = downPayAmountsRatio.setScale(0, BigDecimal.ROUND_HALF_UP);
         calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString());
-        //
+        if (otherPolicyState) {//包含
+            //验证贷款金额是否不大于最高贷款金额
+            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
+            if (loanFinOtherPolicy != null) {
+                if (loanFinOtherPolicy.getMaxLoanAmount() != null && loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                    //根据最高融资比例计算最高融资额
+                    BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                    BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
+                    if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
+                        if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+                    } else {
+                        if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
+                            if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        } else {//maxLoanAmountRat与贷款金额作对比
+                            if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        }
+                    }
+                } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
+                    if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                    }
+
+                } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                    //根据最高融资比例计算最高融资额
+                    BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                    if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                    }
+                }
+            }
+        }
+
         BigDecimal downPayRatioLeast = loanFinPolicy.getDownPayRatioLeast();
         if (downPayAmountsRatio.compareTo(downPayRatioLeast) < 0) {
             return rb.setMsg("实际首付比例不能低于产品政策中的最低首付比例");

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -303,7 +303,7 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto);
 
-    @ApiOperation("App销售订单分页列表")
+    @ApiOperation("App销售订单查询")
     @PostMapping("/getSaleOrdersByOrgPath")
     @ResponseBody
     public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<BusOrderQuery> pq);
@@ -318,10 +318,5 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
 
-    @ApiOperation("销售订单点击贷款人确定")
-    @GetMapping("/judgeIsLoan")
-    @ResponseBody
-    ResultBean<OrderLoanVo> judgeIsLoan(@RequestParam("sid")String sid);
-
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -283,9 +283,4 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
         return null;
     }
-
-    @Override
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        return null;
-    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -97,6 +97,8 @@ public class BusOrderSalesVo implements Vo {
     private boolean showApplyBtn;
     @ApiModelProperty("是否显示录入车架号")
     private boolean showInputBtn;
+    @ApiModelProperty("是否显示贷款人确定按钮")
+    private boolean showBorrowBtn;
 
     private boolean showRePublishBtn;
     @ApiModelProperty("车型信息")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -376,9 +376,4 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.agreeSaleOrderInfoBy(dto);
     }
 
-    @Override
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        return appBusSalesOrderService.judgeIsLoan(sid);
-    }
-
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -719,16 +719,4 @@ public class AppBusSalesOrderService {
         }
         return rb.success().setData(resultBean.getData()).setMsg(resultBean.getMsg());
     }
-
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        ResultBean<OrderLoanVo> rb = ResultBean.fireFail();
-        ResultBean<LoanOrderPreloanVo> resultBean = loanPreloanCreditApplyFeign.judgeIsLoan(sid);
-        if (!resultBean.getSuccess()) {
-            OrderLoanVo orderLoanVo = new OrderLoanVo();
-            LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData();
-            BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo);
-            return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);
-        }
-        return rb.success();
-    }
 }