Merge remote-tracking branch 'origin/master'

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -409,6 +409,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     solutionsDto.setSaleOrderSid(sid);
                     solutionsDto.setShowMore(false);
                     ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                    if(!resultBean.getSuccess()){
+                        return rb.setMsg(resultBean.getMsg());
+                    }
                     entity.setTypeKey("1");
                     entity.setType("资方常规");
                 } else {//金融定制
@@ -423,6 +426,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                 solutionsDto.setSaleOrderSid(sid);
                 solutionsDto.setShowMore(true);
                 ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                if(!resultBean.getSuccess()){
+                    return rb.setMsg(resultBean.getMsg());
+                }
                 entity.setTypeKey("1");
                 entity.setType("资方常规");
                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
@@ -614,6 +620,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if(!resultBean.getSuccess()){
+                                return rb.setMsg(resultBean.getMsg());
+                            }
                         }
                         crmVehicledemand.setTypeKey("1");
                         crmVehicledemand.setType("资方常规");
@@ -629,6 +638,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                         solutionsDto.setSaleOrderSid(sid);
                         solutionsDto.setShowMore(true);
                         ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        if(!resultBean.getSuccess()){
+                            return rb.setMsg(resultBean.getMsg());
+                        }
                     }
                     crmVehicledemand.setTypeKey("1");
                     crmVehicledemand.setType("资方常规");
@@ -666,6 +678,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if(!resultBean.getSuccess()){
+                                return rb.setMsg(resultBean.getMsg());
+                            }
                         }
                         crmVehicledemand.setTypeKey("1");
                         crmVehicledemand.setType("资方常规");
@@ -685,6 +700,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                         solutionsDto.setSaleOrderSid(sid);
                         solutionsDto.setShowMore(true);
                         ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        if(!resultBean.getSuccess()){
+                            return rb.setMsg(resultBean.getMsg());
+                        }
                     }else{
                         loanSolutionsFeign.deleteByOrderSid(sid);
                     }

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

@@ -2187,11 +2187,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
 
     public ResultBean<SolutionssVo> selectDetails3(String busSid) {
         ResultBean<SolutionssVo> rb = ResultBean.fireFail();
-        SolutionssVo solutionssVo = new SolutionssVo();
+        SolutionssVo solutionssVo = null;
         //根据关联sid查询是否存在金融方案
         LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid);
         boolean isTrue = false;
         if (loanSolutions != null) {
+            solutionssVo = new SolutionssVo();
             BeanUtil.copyProperties(loanSolutions, solutionssVo);
             if (loanSolutions.getTrailerAmount() != null) {
                 solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
@@ -2205,7 +2206,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
             }
             isTrue = true;
-        }
             //全款且为三方金融
             if(StringUtils.isBlank(loanSolutions.getTypeKey())){
                 solutionssVo.setShowMore(true);
@@ -2262,6 +2262,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 solutionssVo.setFinanceForms(formList);
             }
             solutionssVo.setBusSid(busSid);
+        }
         return rb.success().setData(solutionssVo);
     }