From a5e5e4044231c17b20b9528ad8bcfa97cac35284 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 25 Mar 2024 15:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=87=91=E8=9E=8D=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E5=8F=98=E6=9B=B4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/BusSalesOrderService.java   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 1202cc1b6a..8ea6546185 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -487,7 +487,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         /*************************************************主车信息*****************************************************/
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {
-            String modelSidAndConfigSid =  baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(),busSalesOrderModelDetailsVo.getModelConfigSid(),vo.getUseOrgSid());
+            String modelSidAndConfigSid = baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(), busSalesOrderModelDetailsVo.getModelConfigSid(), vo.getUseOrgSid());
             busSalesOrderModelDetailsVo.setModelSidAndConfigSid(modelSidAndConfigSid);
             //查询现车车辆
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
@@ -2029,26 +2029,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setClosingDate("-");
             }
             record.setShowFinancialBtn(false);
-            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
-            if (null != data) {
-                if (StringUtils.isNotBlank(record.getSaleOrderState())) {
-                    if (record.getSaleOrderState().equals("已办结")) {
-                        //查询金融方案
-                        LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
-                        if (solutions != null) {
-                            String solutionsSid = solutions.getSid();
-                            BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
-                            if (null != busSolutionsChange) {
-                                if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
-                                    record.setShowFinancialBtn(true);
-                                }
-                            } else {
-                                record.setShowFinancialBtn(true);
-                            }
-                        }
-                    }
-                }
-            }
+            //是否显示金融方案变更按钮
+//            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+//            if (null != data) {
+//                if (StringUtils.isNotBlank(record.getSaleOrderState())) {
+//                    if (record.getSaleOrderState().equals("已办结")) {
+//                        //查询金融方案
+//                        LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+//                        if (solutions != null) {
+//                            String solutionsSid = solutions.getSid();
+//                            BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
+//                            if (null != busSolutionsChange) {
+//                                if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
+//                                    record.setShowFinancialBtn(true);
+//                                }
+//                            } else {
+//                                record.setShowFinancialBtn(true);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
 
 
 
@@ -2246,18 +2247,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isBlank(dto.getUserSid())) {
             return rb.setMsg("用户sid不能为空");
         }
-        if("1".equals(dto.getPayTypeKey())){
-            if(StringUtils.isBlank(dto.getAffiliatedOrgSid())){
+        if ("1".equals(dto.getPayTypeKey())) {
+            if (StringUtils.isBlank(dto.getAffiliatedOrgSid())) {
                 return rb.setMsg("开票信息为必选项");
             }
-        }else{
+        } else {
             dto.setAffiliatedOrgNameChoose("");
             dto.setAffiliatedOrgSid("");
         }
-        if(StringUtils.isNotBlank(dto.getAffiliatedOrgSid())){
-            if("02".equals(dto.getBillingTypeKey())){//增值税
+        if (StringUtils.isNotBlank(dto.getAffiliatedOrgSid())) {
+            if ("02".equals(dto.getBillingTypeKey())) {//增值税
                 CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                if(crmCustomerTemp != null){
+                if (crmCustomerTemp != null) {
                     return rb.setMsg("个人不能开具增值税专用发票");
                 }
             }
@@ -2290,12 +2291,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                     FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
-                    if(finCompanyInvoicing == null){
+                    if (finCompanyInvoicing == null) {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                        if(crmCustomerTemp != null){
+                        if (crmCustomerTemp != null) {
                             busSalesOrder.setAffiliatedCompanyType(1);
                         }
-                    }else{
+                    } else {
                         busSalesOrder.setAffiliatedCompanyType(0);
                     }
                 }
@@ -2376,12 +2377,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                     FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
-                    if(finCompanyInvoicing == null){
+                    if (finCompanyInvoicing == null) {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                        if(crmCustomerTemp != null){
+                        if (crmCustomerTemp != null) {
                             busSalesOrder.setAffiliatedCompanyType(1);
                         }
-                    }else{
+                    } else {
                         busSalesOrder.setAffiliatedCompanyType(0);
                     }
                 }
@@ -3294,7 +3295,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("此销售类型下金融方案不能为空");
             }
         }
-        if(StringUtils.isBlank(busSalesOrder.getFinancePlan())){
+        if (StringUtils.isBlank(busSalesOrder.getFinancePlan())) {
             return rb.setMsg("单据信息中付款方式请选择");
         }
         return rb.success();
@@ -5483,8 +5484,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
-                }else{
-                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
+                } else {
+                    updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
                 }
                 busSalesOrder = fetchBySid(bv.getBusinessSid());
                 //==============================修改车辆的持久状态组装数据
@@ -5639,7 +5640,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     }
 
-    public void updateNo(String sid,String contractNo){
+    public void updateNo(String sid, String contractNo) {
         BusSalesOrder busSalesOrder = fetchBySid(sid);
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
@@ -6704,8 +6705,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
-                }else{
-                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
+                } else {
+                    updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
                 }
             }
         } else {
@@ -7171,10 +7172,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
         String kpj = baseMapper.selKpj(contractNo);
-        if (StringUtils.isNotBlank(kpj)){
+        if (StringUtils.isNotBlank(kpj)) {
             busSalesOrderIsDTKPJVo.setIsEdit(true);
             busSalesOrderIsDTKPJVo.setOneBillMoney(kpj);
-        }else {
+        } else {
             busSalesOrderIsDTKPJVo.setIsEdit(false);
             busSalesOrderIsDTKPJVo.setOneBillMoney("");
         }
@@ -7766,7 +7767,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
         //删除销售订单车辆表中的贷款人的名称
-        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid());
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid, busSalesOrderBorrower.getSalesOrderSid());
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
         if (!busSalesOrderVehicleList.isEmpty()) {
             for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
@@ -7821,7 +7822,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //-------家访准备补充推送createBySid---------
                     homeVisitDto.setCreateBySid(busSalesOrder.getCreateBySid());
                     loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
-                }else{
+                } else {
                     busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
                 }
             }