From 6a127db3af2435e0372c8884cb6b05290a363013 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 10 Oct 2023 11:49:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredService.java | 143 +++++++----------- 1 file changed, 52 insertions(+), 91 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 696e91e569..6e99a5de89 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetai import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountsVo; import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage; import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessagesVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; @@ -191,40 +192,6 @@ public class BusDeliveredService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectListsVoNew(page, qw); - List list = pagging.getRecords(); - list.removeAll(Collections.singleton(null)); - if(!list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { - BusDeliveredVo busDeliveredVo = list.get(i); - String busVinSid = busDeliveredVo.getBusVinSid(); - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid); - if(busSalesOrderVehicle != null){ - String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid(); - String loanContractSid = busSalesOrderVehicle.getLoanContractSid(); - //根据消贷合同和销售订单查询 - ResultBean loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); - if(!loanFileexamineResultBean.getSuccess()){ - busDeliveredVo.setBankStateValue("未审核"); - busDeliveredVo.setZlStateValue("否"); - }else{ - LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); - if("1".equals(loanFileexamine.getZlState())){ - busDeliveredVo.setZlStateValue("是"); - busDeliveredVo.setZlState(loanFileexamine.getZlState()); - }else{ - busDeliveredVo.setZlStateValue("否"); - busDeliveredVo.setZlState(loanFileexamine.getZlState()); - } - if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ - busDeliveredVo.setBankStateValue("未审核"); - }else{ - busDeliveredVo.setBankStateValue(loanFileexamine.getBankStateValue()); - busDeliveredVo.setBankStateKey(loanFileexamine.getBankStateKey()); - } - } - } - } - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -314,44 +281,6 @@ public class BusDeliveredService extends MybatisBaseService iPage = baseMapper.getRetrievalNotListNew(page, qw, name); - List list = iPage.getRecords(); - list.removeAll(Collections.singleton(null)); - if(!list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { - AppBusDeliveredPageVo busDeliveredVos = list.get(i); - List vinList = busDeliveredVos.getVinList(); - for (int j = 0; j < vinList.size(); j++) { - AppVinListVo appVinListVo = vinList.get(j); - String busVinSid = appVinListVo.getBusVinSid(); - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid); - if(busSalesOrderVehicle != null){ - String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid(); - String loanContractSid = busSalesOrderVehicle.getLoanContractSid(); - //根据消贷合同和销售订单查询 - ResultBean loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); - if(!loanFileexamineResultBean.getSuccess()){ - appVinListVo.setBankStateValue("未审核"); - appVinListVo.setZlStateValue("否"); - }else{ - LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); - if("1".equals(loanFileexamine.getZlState())){ - appVinListVo.setZlStateValue("是"); - appVinListVo.setZlState(loanFileexamine.getZlState()); - }else{ - appVinListVo.setZlStateValue("否"); - appVinListVo.setZlState(loanFileexamine.getZlState()); - } - if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ - appVinListVo.setBankStateValue("未审核"); - }else{ - appVinListVo.setBankStateValue(loanFileexamine.getBankStateValue()); - appVinListVo.setBankStateKey(loanFileexamine.getBankStateKey()); - } - } - } - } - } - } return iPage; } @@ -515,30 +444,34 @@ public class BusDeliveredService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); - if(!loanFileexamineResultBean.getSuccess()){ - appCarListVo.setBankStateValue("未审核"); - appCarListVo.setZlStateValue("否"); - }else{ - LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); - if("1".equals(loanFileexamine.getZlState())){ - appCarListVo.setZlStateValue("是"); - appCarListVo.setZlState(loanFileexamine.getZlState()); - }else{ - appCarListVo.setZlStateValue("否"); - appCarListVo.setZlState(loanFileexamine.getZlState()); - } - if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()); + if(busSalesOrder != null && "2".equals(busSalesOrder.getPayTypeKey())){ + String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid(); + String loanContractSid = busSalesOrderVehicle.getLoanContractSid(); + //根据消贷合同和销售订单查询 + ResultBean loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ appCarListVo.setBankStateValue("未审核"); + appCarListVo.setZlStateValue("否"); }else{ - appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue()); - appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + appCarListVo.setZlStateValue("是"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + }else{ + appCarListVo.setZlStateValue("否"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + appCarListVo.setBankStateValue("未审核"); + }else{ + appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue()); + appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } } } + carList.add(appCarListVo); } @@ -854,6 +787,34 @@ public class BusDeliveredService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ + appCarListVo.setBankStateValue("未审核"); + appCarListVo.setZlStateValue("否"); + }else{ + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + appCarListVo.setZlStateValue("是"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + }else{ + appCarListVo.setZlStateValue("否"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + appCarListVo.setBankStateValue("未审核"); + }else{ + appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue()); + appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } + } + } + list.add(appCarListVo); } return rb.success().setData(list);