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 2ec98195ef..f0baab4c17 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 @@ -53,4 +53,8 @@ public interface BaseVehicleStateFeign { ResultBean updateManageState(@RequestParam("busVinSid") String busSid); + @PostMapping("selectOneByBusSidAndOrderSid") + @ResponseBody + ResultBean selectOneByBusSidAndOrderSid(@RequestParam("busSid") String busSid,@RequestParam("orderSid") String orderSid); + } 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 1e247f9b73..d4732d88c4 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 @@ -25,11 +25,14 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneQKKPByBusSid(String sid); BaseVehicleState selectByBusSid(String busSid); - List selectBusSidListByBusState(String busState); + List selectBusSidListByBusState(String busState); int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState); int updateManageState(String busSid); + + @Select(" SELECT * FROM base_vehicle_state WHERE busSid = #{busSid} AND saleOrderSid = #{orderSid}") + BaseVehicleState selectOneByBusSidAndOrderSid(@Param("busSid") String busSid, @Param("orderSid") String orderSid); } 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 e2cc52cbb3..0d012b7737 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 @@ -60,5 +60,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { return baseVehicleStateService.updateManageState(busSid); } + @Override + public ResultBean selectOneByBusSidAndOrderSid(String busSid, String orderSid) { + return baseVehicleStateService.selectOneByBusSidAndOrderSid(busSid,orderSid); + } + } 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 77b3dc2cd1..7a433460a8 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 @@ -230,4 +230,10 @@ public class BaseVehicleStateService extends MybatisBaseService selectOneByBusSidAndOrderSid(String busSid, String orderSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSidAndOrderSid(busSid,orderSid); + return rb.success().setData(baseVehicleState); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 6dfab1fb7c..dee0dc2696 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; @@ -124,7 +126,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService private FinCompanyInvoicingService finCompanyInvoicingService; @Autowired private FinVehicleInvoiceService finVehicleInvoiceService; - + @Autowired + private BaseVehicleStateFeign baseVehicleStateFeign; @Autowired private FinFundsCarriedForwardApplyService finFundsCarriedForwardApplyService; @@ -506,33 +509,41 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts())) || (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium())) || (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle()))) { - List sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo()); - List noSubscriptionMoneyList = new ArrayList<>(); - List noSubscriptionMoneyCheckList = new ArrayList<>(); - if (null != sidList) { - for (String s : sidList) { - FinUncollectedReceivablesDetailed detailed = fetchBySid(s); - List detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData(); - BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN); - for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) { - BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney(); - sumCheck = sumCheck.add(subscriptionMoney); + BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(),salesOrderSid).getData(); + if (null != vehicleState) { + if (StringUtils.isNotBlank(vehicleState.getFinState())) { + if (vehicleState.getFinState().equals("1")) { + record.setDownload(true); } - BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney()); - BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck); - noSubscriptionMoneyList.add(noSubscriptionMoneyCheck); - } - if (null != noSubscriptionMoneyList) { - for (BigDecimal money : noSubscriptionMoneyList) { - if (money.compareTo(BigDecimal.ZERO) > 0) { - noSubscriptionMoneyCheckList.add(1); - } - } - } - if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) { - record.setDownload(true); } } +// List sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo()); +// List noSubscriptionMoneyList = new ArrayList<>(); +// List noSubscriptionMoneyCheckList = new ArrayList<>(); +// if (null != sidList) { +// for (String s : sidList) { +// FinUncollectedReceivablesDetailed detailed = fetchBySid(s); +// List detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData(); +// BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN); +// for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) { +// BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney(); +// sumCheck = sumCheck.add(subscriptionMoney); +// } +// BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney()); +// BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck); +// noSubscriptionMoneyList.add(noSubscriptionMoneyCheck); +// } +// if (null != noSubscriptionMoneyList) { +// for (BigDecimal money : noSubscriptionMoneyList) { +// if (money.compareTo(BigDecimal.ZERO) > 0) { +// noSubscriptionMoneyCheckList.add(1); +// } +// } +// } +// if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) { +// record.setDownload(true); +// } +// } } } }