diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index 7dee4fcd4f..d00d2f4fed 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -33,4 +33,8 @@ public interface BaseVehicleStateFeign { @PostMapping("selectOneQKKPByBusSid") @ResponseBody ResultBean selectOneQKKPByBusSid(@RequestParam("busSid") String sid); + + @PostMapping("selectByVinSid") + @ResponseBody + ResultBean selectByVinSid(@RequestParam("vehSid") String vehSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index 0c593ce268..e29f8f8317 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -21,4 +21,6 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneByBusSid(String busSid); BaseVehicleState selectOneQKKPByBusSid(String sid); + + BaseVehicleState selectByVinSid(String vehSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 5409c5776e..543e03452d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -32,4 +32,12 @@ AND carryInvoiceState = '0' AND busState = '401' + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java index dce1aae138..380384e418 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java @@ -40,5 +40,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { return baseVehicleStateService.selectOneQKKPByBusSid(sid); } + @Override + public ResultBean selectByVinSid(String vehSid) { + return baseVehicleStateService.selectByVinSid(vehSid); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 8f65e33d0f..c7a5ea8569 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -180,4 +180,10 @@ public class BaseVehicleStateService extends MybatisBaseService selectByVinSid(String vehSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid); + return rb.success().setData(baseVehicleState); + } } 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 71edc7fa99..371d51f023 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 @@ -7086,16 +7086,7 @@ public class BusSalesOrderService extends MybatisBaseService> rb = ResultBean.fireFail(); List stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid); stringList.removeAll(Collections.singleton(null)); - List busSids = new ArrayList<>(); - for (String orderSid : stringList) { - SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(orderSid).getData(); - if (solutionsDetailsVo != null) { - if ("02".equals(solutionsDetailsVo.getTypeKey())) { - busSids.add(orderSid); - } - } - } - return rb.success().setData(busSids); + return rb.success().setData(stringList); } public List selectByContractNoToVin(String contractId) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 0f893a2cf7..29e7274f42 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; @@ -2015,6 +2016,13 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); + for (FinBillVehicleDto finBillVehicle : finBillVehicles) { + BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData(); + if (baseVehicleState == null){ + return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票,请重新选择"); + } + } String contractNo = dto.getContractNo(); List finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); if (finBillApplicationDetailsVos != null) {