From 4558ee408b4fa6a1248f4bd4dff9ebc51a45fe7a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 3 Nov 2023 09:46:31 +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 --- .../LoanOtherReceivablePush.java | 1 - .../BusSalesOrderLoancontractService.java | 79 ++++++++++--------- .../BusSalesOrderVehicleMapper.java | 2 +- .../BusSalesOrderVehicleMapper.xml | 2 +- .../BusSalesOrderVehicleService.java | 4 +- .../api/dailyreport/DailyReportFeign.java | 1 + .../biz/dailyreport/DailyReportService.java | 1 + .../LoanCapitalCreditResultService.java | 1 - 8 files changed, 48 insertions(+), 43 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java index 85c1453882..283aec2508 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java @@ -14,5 +14,4 @@ public class LoanOtherReceivablePush { private String borrowerSid; @ApiModelProperty("销售订单sid") private String saleOrderSid; - private String loanContractSid; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 6ea93a7e6e..b4efe97bd6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -291,49 +291,54 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),saleOrderSid); //这是生成业务系统融资放款应收的逻辑： // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中， //计算融资放款的金额以及厂家贴息金额 ResultBean resultBean = loanSolutionsFeign.selectMoney(saleOrderSid); if (resultBean.getData() != null) { PushVo pushVo = resultBean.getData(); - UnCollectionDto unCollectionDto = new UnCollectionDto(); - unCollectionDto.setContractNo(busSalesOrder.getContractNo()); -// unCollectionDto.setContractSid(contractSid); - //客户名称 - unCollectionDto.setCustomerName(busSalesOrder.getCustomerName()); - //客户sid - unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid()); - //客户类型 - unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass()); - //客户类型 - unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey()); - //客户头像 - unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto()); - unCollectionDto.setReceivablesName("融资放款"); - unCollectionDto.setCustomerPhone(busSalesOrder.getMobile()); - unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid()); - unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo()); - unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney()); - unCollectionDto.setUserSid(busSalesOrder.getCreateBySid()); - unCollectionDto.setReveivableMoney(pushVo.getMoney()); - unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid()); - unCollectionDto.setPayType(busSalesOrder.getPayType()); - unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey()); - unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); - unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); - unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath()); - unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid()); - unCollectionDto.setStaffName(busSalesOrder.getStaffName()); - unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName()); - unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid()); - unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName()); - unCollectionDto.setKxState("01"); - if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) { - unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney())); + busSalesOrderVehicleList.removeAll(Collections.singleton(null)); + if(!busSalesOrderVehicleList.isEmpty()){ + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + UnCollectionDto unCollectionDto = new UnCollectionDto(); + unCollectionDto.setContractNo(busSalesOrder.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(busSalesOrder.getCustomerName()); + //客户sid + unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass()); + //客户类型 + unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey()); + //客户头像 + unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto()); + unCollectionDto.setReceivablesName("融资放款"); + unCollectionDto.setCustomerPhone(busSalesOrder.getMobile()); + unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid()); + unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo()); + unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney()); + unCollectionDto.setUserSid(busSalesOrder.getCreateBySid()); + unCollectionDto.setReveivableMoney(pushVo.getMoney()); + unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid()); + unCollectionDto.setPayType(busSalesOrder.getPayType()); + unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey()); + unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath()); + unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid()); + unCollectionDto.setStaffName(busSalesOrder.getStaffName()); + unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName()); + unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid()); + unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName()); + unCollectionDto.setKxState("01"); + if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) { + unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney())); + } + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } } - finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); } } return rb.success(); @@ -352,7 +357,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService selectListByOrdersSid2(String saleOrderSid); BusSalesOrderVehicle selectByBorrowSid(String sid); - BusSalesOrderVehicle selectByBorrowSid2(@Param("sid") String sid,@Param("loanContractSid") String loanContractSid); + List selectByBorrowSid2(@Param("sid") String sid,@Param("orderSid") String orderSid); @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}") BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 8775c08263..1422169b55 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -291,7 +291,7 @@