From da885de785c4e8259f189487548c7209ab580073 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 17 May 2024 16:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=B8=9A=E5=8A=A1=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8=E7=9A=84=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=BF=85=E9=A1=BB=E6=BB=A1=E8=B6=B3=E9=A6=96=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E5=8F=8A=E8=B4=B9=E7=94=A8=E4=BA=A4=E6=B8=85=EF=BC=88?=
 =?UTF-8?q?=E5=90=AB=E8=AE=A2=E9=87=91=EF=BC=89=E4=B8=94=E6=8B=85=E4=BF=9D?=
 =?UTF-8?q?=E7=9A=84=E5=AE=B6=E8=AE=BF=E8=B5=84=E6=96=99=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=88=96=E9=9D=9E=E6=8B=85=E4=BF=9D=E5=AE=B6?=
 =?UTF-8?q?=E8=AE=BF=E8=80=83=E5=AF=9F=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdelivered/BusDeliveredMapper.xml   |  4 ++--
 .../BusDeliveredApplyService.java             | 21 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
index fd7e109489..4b9bd037bf 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
@@ -308,7 +308,7 @@
             WHERE
             busState = '401'
            <!-- AND  (finState = '1' OR carryVehicleState = '1' )) AND bbv.vehicleState != '0002'-->
-            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and invoiceApplyState = '1')))  AND bbv.vehicleState != '0002'
+            AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )) or (saleTypeKey = '2' and finState = '1' and manageState = '1')))  AND bbv.vehicleState != '0002'
         </where>
         order by bo.contractNo desc,bv.id desc) a
 
@@ -447,7 +447,7 @@
             anrui_base.base_vehicle_state
             WHERE
             busState = '401'
-            AND (saleTypeKey = '2' and invoiceApplyState = '1'))
+            AND (saleTypeKey = '2' and finState = '1' and manageState = '1'))
             AND bbv.vehicleState != '0002'
         </where>
         GROUP BY
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index ed4765e526..bdcc85402e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -416,27 +416,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
-            if ("2".equals(dto.getPaymentMethodKey()) && "1".equals(dto.getIsInvoicing())){
-                List<BusDeliveredApplyDetailsDto> detailsList = dto.getDetailsList();
-                for (BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto : detailsList) {
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractNo(), busDeliveredApplyDetailsDto.getVinSid());
-                    BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
-                    if (!"1".equals(baseVehicleState.getFinState())){
-                        return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "款项未交清，保存失败");
-                    }
-                    if ("3".equals(baseVehicleState.getFinSourceKey())){//非担保
-                        String investigateValue = loanHomevisitInvestigateFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                        if (!"通过".equals(investigateValue)){
-                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访考察未通过，保存失败");
-                        }
-                    }else if ("4".equals(baseVehicleState.getFinSourceKey())){//担保
-                        String state = loanHomevisitFileexamineFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                        if (!"2".equals(state)){
-                            return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访资料审核未通过，保存失败");
-                        }
-                    }
-                }
-            }
             //新增
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");