From 8859a3fb6251bbda3c74d16a37bad2919d89f7b1 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 24 Nov 2022 11:40:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?PC=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8F=8A=E7=A1=AE=E8=AE=A4=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleTempstateFeign.java | 5 + .../BaseVehicleTempstateFeignFallback.java | 5 + .../BaseVehicleTempstateMapper.java | 2 + .../BaseVehicleTempstateMapper.xml | 20 +++- .../BaseVehicleTempstateRest.java | 7 ++ .../BaseVehicleTempstateService.java | 4 + .../commoncontract/CommonContractService.java | 64 ++++++++++- .../api/bussalesorder/BusSalesOrderFeign.java | 6 + .../BusSalesOrderFeignFallback.java | 6 + .../biz/bussalesorder/BusSalesOrderRest.java | 6 + .../bussalesorder/BusSalesOrderService.java | 9 ++ .../BusSalesOrderPriceMapper.java | 2 + .../BusSalesOrderPriceMapper.xml | 7 ++ .../BusSalesOrderPriceService.java | 4 + .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 8 ++ .../FinCollectionConfirmationService.java | 108 +++++++++++------- .../FinSelectedReceivablesDetailedMapper.java | 6 + .../FinSelectedReceivablesDetailedMapper.xml | 73 +++++++----- ...FinSelectedReceivablesDetailedService.java | 12 ++ ...UncollectedReceivablesDetailedService.java | 27 ++++- 21 files changed, 308 insertions(+), 75 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index b0a59fcd83..d2f68a5107 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -89,4 +89,9 @@ public interface BaseVehicleTempstateFeign { @GetMapping("/selectAllOne/{s}") @ResponseBody ResultBean> selectAllOne(@PathVariable("s") String s); + + @ApiOperation("根据业务类型查询临时状态") + @GetMapping("/getList") + @ResponseBody + ResultBean> getList(@RequestParam("tempStateKey")String tempStateKey); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java index 103d5d1df2..61f6f9090d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java @@ -84,4 +84,9 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe public ResultBean> selectAllOne(String s) { return null; } + + @Override + public ResultBean> getList(String tempStateKey) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java index 7565988222..7cdf9d17de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java @@ -70,4 +70,6 @@ public interface BaseVehicleTempstateMapper extends BaseMapper selectAllOne(String s); + + List getList(String tempStateKey); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml index 7886e27c48..4e5c47f79f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml @@ -4,12 +4,24 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java index 3fff9ffad3..bb85264de8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java @@ -114,4 +114,11 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign { List stringList = baseVehicleTempstateService.selectAll(s); return rb.success().setData(stringList); } + + @Override + public ResultBean> getList(String tempStateKey) { + ResultBean> rb = ResultBean.fireFail(); + List baseVehicleTempstates = baseVehicleTempstateService.getList(tempStateKey); + return rb.success().setData(baseVehicleTempstates); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java index d54a22d901..df5b87ca35 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java @@ -120,4 +120,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService selectAllOne(String s) { return baseMapper.selectAllOne(s); } + + public List getList(String tempStateKey) { + return baseMapper.getList(tempStateKey); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 63d29bfac9..43623e90d6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -81,8 +81,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader; - /** * Project: anrui-base(安瑞基础)
* File: CommonContractService.java
@@ -1516,6 +1514,68 @@ public class CommonContractService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinList(); + for (int i = 0; i < vinList.size(); i++) { + UnCollectionDto unCollectionDto = new UnCollectionDto(); + //合同sid + unCollectionDto.setContractSid(commonContract.getSid()); + //合同编号 + unCollectionDto.setContractNo(commonContract.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); + //客户sid + unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); + //客户类型 + unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); + //客户头像 + unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); + unCollectionDto.setReceivablesName("车款"); + unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); + unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); + unCollectionDto.setVinNo(vinList.get(i).toString()); + unCollectionDto.setCurrentReceivableMoney(money); + unCollectionDto.setUserSid(dto.getUserSid()); + unCollectionDto.setReveivableMoney(money); + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } else { + int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue(); + for (int i = 0; i < qualiy; i++) { + UnCollectionDto unCollectionDto = new UnCollectionDto(); + //合同sid + unCollectionDto.setContractSid(commonContract.getSid()); + //合同编号 + unCollectionDto.setContractNo(commonContract.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); + //客户sid + unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); + //客户类型 + unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); + //客户头像 + unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); + unCollectionDto.setReceivablesName("车款"); + unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); + unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); + unCollectionDto.setCurrentReceivableMoney(money); + unCollectionDto.setUserSid(dto.getUserSid()); + unCollectionDto.setReveivableMoney(money); + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } + + } //添加推送至款项确认的应收未收明细中 if ("现车".equals(appOrderDetailsVo.getOrderType())) { List vinList = appOrderModelInfoVo.getVinList(); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 8cedb3b0ed..447bd84afb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -232,4 +233,9 @@ public interface BusSalesOrderFeign { @GetMapping("/getVinSidByConSid") @ResponseBody ResultBean getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo); + + @ApiOperation("查询该合同下的单车成交价") + @GetMapping("/selectByContractNo") + @ResponseBody + ResultBean selectByContractNo(@RequestParam("contractNo")String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 8e28f94215..affad6efba 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -208,4 +209,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean getVinSidByConSid(String contractNo, String vinNo) { return null; } + + @Override + public ResultBean selectByContractNo(String contractNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index e38812954c..282d2d112a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -37,6 +37,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.PagerUtil; @@ -285,4 +286,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean getVinSidByConSid(String contractNo, String vinNo) { return busSalesOrderService.getVinSidByConSid(contractNo,vinNo); } + + @Override + public ResultBean selectByContractNo(String contractNo) { + return busSalesOrderService.selectByContractNoOne(contractNo); + } } 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 a4f7881c9e..e6589f201c 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 @@ -2904,4 +2904,13 @@ public class BusSalesOrderService extends MybatisBaseService selectByContractNoOne(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectByContractNoOne(contractNo); + if(busSalesOrderPrice == null){ + return rb.setData(new BusSalesOrderPrice()); + } + return rb.success().setData(busSalesOrderPrice); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java index ae450cf0d7..324b47a141 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java @@ -91,4 +91,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper * @return */ AppOrderPriceInfoVo selectPrice(String sid); + + BusSalesOrderPrice selectByContractNoOne(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml index cd7016d173..6c5d4183ba 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml @@ -59,4 +59,11 @@ from bus_sales_order_price bp where bp.salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java index 1c40c92d37..560989f789 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java @@ -195,4 +195,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService selectByState(); int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal); + + List getList(@Param("stringList") List stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 1d99763a60..fe336a666a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -90,4 +90,12 @@ update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 29da9d0a7c..2c1a3b1127 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -40,6 +40,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; @@ -50,8 +51,6 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -141,8 +140,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService records = pagging.getRecords(); for (FinCollectionConfirmationVo record : records) { //是否有余额 - if(StringUtils.isNotBlank(record.getBalance())){ + if (StringUtils.isNotBlank(record.getBalance())) { //余额是0 - if(new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0){ + if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0) { record.setShowHandle(false); - }else{ + } else { //是否是待审核状态或已驳回状态 - if(record.getAuditState() == 1 || record.getAuditState() == 2){ + if (record.getAuditState() == 1 || record.getAuditState() == 2) { record.setShowHandle(false); - }else{ + } else { record.setShowHandle(true); } } - }else{ + } else { record.setShowHandle(false); } } @@ -291,13 +290,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN()); @@ -305,13 +312,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1); - finSelectedReceivablesDetailedVos.stream().forEach(v -> { - //已选款项明细sid - String selectSid = v.getSid(); - //应收未收款项明细sid - String receivablesSid = v.getReceivablesSid(); - FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid); - BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney(); - //更新当前应收金额 - finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney.subtract(new BigDecimal(v.getSubscriptionMoney()))); - //更新认款状态 - finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2); - finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); - FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid); - //更新已选款项明细的审核状态1待审核/2已驳回/3已审核 - finSelectedReceivablesDetailed.setAuditState(3); - //更新审核时间 - finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); - finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); - //ToDo:查询是否符合待出库的条件 - }); + if(finSelectedReceivablesDetailedVos.size()>0){ + finSelectedReceivablesDetailedVos.stream().forEach(v -> { + //已选款项明细sid + String selectSid = v.getSid(); + //应收未收款项明细sid + String receivablesSid = v.getReceivablesSid(); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney(); + //更新当前应收金额 + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney.subtract(new BigDecimal(v.getSubscriptionMoney()))); + //更新认款状态 + finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid); + //更新已选款项明细的审核状态1待审核/2已驳回/3已审核 + finSelectedReceivablesDetailed.setAuditState(3); + //更新审核时间 + finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); + finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); + //ToDo:查询是否符合待出库的条件 + //该合同编号下的该车架号的所有认款金额 + List voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(),v.getVIN()); + BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + //查询该合同编号下的销售订单的单车成交价 + ResultBean resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo()); + if(resultBean.getSuccess()){ + BusSalesOrderPrice busSalesOrderPrice = resultBean.getData(); + BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice(); + if(singleFinalPrice.compareTo(bigDecimalVinAll) == 0){//推送待出库 + + } + + + } + }); + //查询该申请已认款金额总数 + subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + //查询该申请所有的款项明细 finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3); - //查询该申请已认款金额总数 - BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款 confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) == 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2); //更新收款申请的余额以及审核状态 @@ -1245,4 +1269,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService getList(List stringList, String createBySid, String useOrgSid) { + return baseMapper.getList(stringList, createBySid, useOrgSid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index a42474ee0a..17ff3f2fcb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -99,4 +99,10 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectByCollSid(@Param("collectionBillSid") String collectionBillSid); List selByContractNo(String contractNo); + + List selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid); + + List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin); + + List getList(@Param("list") List sidsList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 3993f43261..90fe26ee5d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -5,7 +5,8 @@ - SELECT * FROM fin_selected_receivables_detailed + SELECT * + FROM fin_selected_receivables_detailed ${ew.sqlSegment} @@ -22,27 +24,25 @@ @@ -87,12 +87,33 @@ + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 6cae9a229c..62fe1d50c3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -212,4 +212,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService list = baseMapper.selByContractNo(contractNo); return list; } + + public List selectListByAuditState(int i,String userSid,String useOrgSid) { + return baseMapper.selectListByAuditState(i,userSid,useOrgSid); + } + + public List selectListByVin(String contractNo, String vin) { + return baseMapper.selectListByVin(contractNo, vin); + } + + public List getList(List sidsList) { + return baseMapper.getList(sidsList); + } } \ No newline at end of file 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 f6633c08dd..317dc9cfb6 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 @@ -27,10 +27,15 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -49,6 +54,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; +import java.util.stream.Collectors; /** * Project: anrui-fin(销售相关)
@@ -76,6 +82,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehicleTempstateFeign baseVehicleTempstateFeign; + @Autowired + private FinCollectionConfirmationService finCollectionConfirmationService; private QueryWrapper createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) { /** @@ -94,9 +104,20 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } } } - //查询待审核状态下的款项申请的 -// ResultBean resultBean = - + ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + List list = resultBean.getData(); + if(list.size()>0){ + List stringList = list.stream().map(v->v.getBusSid()).distinct().collect(Collectors.toList()); + List sidsList = finCollectionConfirmationService.getList(stringList,query.getCreateBySid(),query.getUseOrgSid()); + if(sidsList.size()>0){ + //查询该申请下是否存在款项明细 + List finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedService.getList(sidsList); + List strings = finSelectedReceivablesDetaileds.stream().map(v->v.getReceivablesSid()).distinct().collect(Collectors.toList()); + if(strings.size()>0){ + qw.notIn("sid",strings); + } + } + } if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("contractNo", query.getContractNo()); } From 638358b7486987873b2b0994862da69e797cb29a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 24 Nov 2022 12:13:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=BB=E8=81=8C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E7=99=BB=E5=BD=95=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java | 4 ++-- .../java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 9c86a8af60..3e5428b7ca 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -326,7 +326,7 @@ public class SysUserRest implements SysUserFeign { String captcha = redisUtil.get(uuid); List list = JSONObject.parseArray(captcha, Map.class); - /*if (StringUtils.isEmpty(verifyCode)) { + if (StringUtils.isEmpty(verifyCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } @@ -391,7 +391,7 @@ public class SysUserRest implements SysUserFeign { isCorrect = true; } else { return new ResultBean().fail().setMsg("验证码错误"); - }*/ + } if (StringUtils.isBlank(userName)) { return new ResultBean().fail().setMsg("用户名不能为空"); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 3ad54bc929..e33b75d120 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -126,6 +126,7 @@ public class SysUserService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getName())) { qw.like("staff.name", query.getName()); } + qw.ne("staff.personTypeKey","01"); return qw; }