优化

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

@@ -1677,7 +1677,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //查询该销售订单是否存在金融方案
             //ToDo:
-            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(saleOrderSid);
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(saleOrderSid);
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
             if (solutionsDetailsVo == null) {
                 vo.setFinanceInfoState(0);
@@ -2828,7 +2828,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
         if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
             //根据销售订单sid查询金融方案
-            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
             if (solutionsDetailsVo != null) {
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
@@ -3447,7 +3447,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vo = selectSolutions(vo, sid);
         //===============================================
         //挂车价格（金融方案中取）
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -3524,7 +3524,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -4049,7 +4049,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     public AppOrderDetailsVo selectSolution(AppOrderDetailsVo appOrderDetailsVo, String sid) {
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
+        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
             StringBuilder loanSolutions = new StringBuilder();
@@ -4892,7 +4892,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //为三方金融和担保贷款
                 if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
                     //根据销售订单sid查询金融方案
-                    ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(bv.getBusinessSid());
+                    ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
                     SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
                     if (solutionsDetailsVo != null) {
                         if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
@@ -5174,7 +5174,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 //三方金融
                 //查询是外部金融还是自用非担保，如果是外部金融的话，厂家贴息为0时，不走金融审批
-                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid());
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
                 if (solutionsDetailsVoResultBean.getData() != null) {
                     SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
                     if ("02".equals(solutionsDetailsVo.getTypeKey())) {

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

@@ -43,6 +43,10 @@ public interface LoanSolutionsFeign {
     @GetMapping("/selectDetailss")
     ResultBean<SolutionsDetailsVo> selectDetailss(@RequestParam("businessSid") String businessSid);
 
+    @ApiOperation("根据销售订单sid查询金融方案")
+    @GetMapping("/selectDetailsss")
+    ResultBean<SolutionsDetailsVo> selectDetailsss(@RequestParam("businessSid") String businessSid);
+
     @ApiOperation("删除该销售订单的金融方案")
     @DeleteMapping("/deleteByOrderSid")
     ResultBean deleteByOrderSid(@RequestParam("sid") String sid);

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

@@ -37,6 +37,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<SolutionsDetailsVo> selectDetailsss(String businessSid) {
+        return null;
+    }
+
     @Override
     public ResultBean deleteByOrderSid(String sid) {
         return null;

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

@@ -48,6 +48,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
         return loanSolutionsService.selectDetailss(businessSid);
     }
 
+    @Override
+    public ResultBean<SolutionsDetailsVo> selectDetailsss(String businessSid) {
+        return loanSolutionsService.selectDetailsss(businessSid);
+    }
+
     @Override
     public ResultBean deleteByOrderSid(String sid) {
         return loanSolutionsService.deleteByOrderSid(sid);

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

@@ -605,6 +605,25 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rb.success().setData(solutionsDetailsVo);
     }
 
+    public ResultBean<SolutionsDetailsVo> selectDetailsss(String businessSid) {
+        ResultBean<SolutionsDetailsVo> rb = ResultBean.fireFail();
+        SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo();
+        LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(businessSid);
+        if (loanSolutions == null) {
+            return rb;
+        }
+        BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
+        LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
+        if (loanSolutionsOtherpolicy != null) {
+            BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionsDetailsVo);
+        }
+        LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+        if (loanSolutionsDetail != null) {
+            BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
+        }
+        return rb.success().setData(solutionsDetailsVo);
+    }
+
     public ResultBean deleteByOrderSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         //查询金融方案