From 4280511f17ad4a85a1613eea81b8af480dd85c09 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 18 Mar 2023 16:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 218 +++++++++--------- .../FinCollectionConfirmationService.java | 4 +- 2 files changed, 111 insertions(+), 111 deletions(-) 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 4eb4c8e235..5462b0ec73 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 @@ -1335,9 +1335,9 @@ public class BusSalesOrderService extends MybatisBaseService getSaleOrders(PagerQuery pq) { QueryWrapper qw = appCreateQueryWrapper(pq.getParams()); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),""); + IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); for (AppBusSalesOrderVo record : pagging.getRecords()) { ResultBean commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); - if(commonContractVoResultBean.getData() != null){ + if (commonContractVoResultBean.getData() != null) { record.setContractId(commonContractVoResultBean.getData().getContractNo()); } AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData(); List vinListsVos = appOrderDetailsVo.getModelInfo().getVinListsVos(); List vinSids = new ArrayList<>(); - for (VinListsVo vinListsVo : vinListsVos){ + for (VinListsVo vinListsVo : vinListsVos) { vinSids.add(vinListsVo.getVinSid()); } int i = busHandoverService.selectByCount(record.getContractId(), vinSids); - if (record.isShowStopBtn() && i < vinSids.size()){ + if (record.isShowStopBtn() && i < vinSids.size()) { record.setShowStopBtn(true); - }else { + } else { record.setShowStopBtn(false); } if (StringUtils.isNotBlank(record.getCustomerImage())) { @@ -1564,9 +1564,9 @@ public class BusSalesOrderService extends MybatisBaseService details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); if (details.getData() != null) { String vehicleKey = details.getData().getVehicleType(); - if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){ + if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) { orderInfo.setPublicModelNullable(false); - }else{ + } else { orderInfo.setPublicModelNullable(true); } } @@ -2097,9 +2097,9 @@ public class BusSalesOrderService extends MybatisBaseService details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); if (details.getData() != null) { String vehicleKey = details.getData().getVehicleType(); - if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){ + if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) { orderInfo.setPublicModelNullable(false); - }else{ + } else { orderInfo.setPublicModelNullable(true); } } @@ -2794,7 +2794,7 @@ public class BusSalesOrderService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid); - if(commonContractVoResultBean.getData() != null){ + if (commonContractVoResultBean.getData() != null) { vo.setContractId(commonContractVoResultBean.getData().getContractNo()); } vo.setUserSid(busSalesOrder.getCreateBySid()); @@ -2926,7 +2926,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(sid); @@ -3271,7 +3271,7 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo()); List finUncollectedReceivablesDetailedList = listResultBean.getData(); - if(finUncollectedReceivablesDetailedList.size() == 0){ - saveFinSelect(appOrderDetailsVo,commonContract,userSid); + if (finUncollectedReceivablesDetailedList.size() == 0) { + saveFinSelect(appOrderDetailsVo, commonContract, userSid); } } - public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo,CommonContract commonContract,String userSid){ + public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo, CommonContract commonContract, String userSid) { AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); @@ -3396,14 +3396,14 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); //更新销售订单的临时号 - if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 - for(int i = 0; i < vinList.size(); i++){ + if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {//贷款 + for (int i = 0; i < vinList.size(); i++) { //销售订单中车辆表的sid String salesOrderVinSid = vinList.get(i).getSid(); String temporaryNum = String.format("%02d", i + 1); - String temporaryNo = commonContract.getContractNo()+temporaryNum; + String temporaryNo = commonContract.getContractNo() + temporaryNum; //更新临时号 - ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid,temporaryNo); + ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo); } } //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金 @@ -3497,69 +3497,17 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData(); - //单台成交价与单台订金相等 - if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 - String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); - List vinList = appOrderModelInfoVo.getVinListsVos(); - for (int i = 0; i < vinList.size(); i++) { - UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - //客户名称 - unCollectionDto.setCustomerName(vo.getName()); - //客户sid - unCollectionDto.setCustomerSid(vo.getCustomerSid()); - //客户类型 - unCollectionDto.setCustomerClass(vo.getCustomerKey()); - //客户类型 - unCollectionDto.setCustomerClassKey(vo.getCustomerType()); - //客户头像 - unCollectionDto.setCustomerImage(vo.getCustomerImage()); - unCollectionDto.setReceivablesName("车款"); - unCollectionDto.setCustomerPhone(vo.getPhone()); - unCollectionDto.setUseOrgSid(vo.getUseOrgSid()); - unCollectionDto.setVinNo(vinList.get(i).getVinNo()); - unCollectionDto.setCurrentReceivableMoney(money); - unCollectionDto.setUserSid(busSalesOrder.getCreateBySid()); - unCollectionDto.setReveivableMoney(money); - unCollectionDto.setBusVinSid(vinList.get(i).getSid()); - unCollectionDto.setPayType(vo.getPayType()); - unCollectionDto.setPayTypeKey(vo.getPayTypeKey()); - unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName()); - unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid()); - finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); - } - } + //推送车款 + createCarFin(vo, busSalesOrder); + //-----------------推送车款款项结束 //推送采购渠道待选择 BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto(); @@ -3588,6 +3536,58 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); + CommonContract commonContract = commonContractResultBean.getData(); + //单台成交价与单台订金相等 + if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 + String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); + List vinList = appOrderModelInfoVo.getVinListsVos(); + for (int i = 0; i < vinList.size(); i++) { + UnCollectionDto unCollectionDto = new UnCollectionDto(); + //合同sid + unCollectionDto.setContractSid(commonContract.getSid()); + //合同编号 + unCollectionDto.setContractNo(commonContract.getContractNo()); + //客户名称 + unCollectionDto.setCustomerName(vo.getName()); + //客户sid + unCollectionDto.setCustomerSid(vo.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(vo.getCustomerKey()); + //客户类型 + unCollectionDto.setCustomerClassKey(vo.getCustomerType()); + //客户头像 + unCollectionDto.setCustomerImage(vo.getCustomerImage()); + unCollectionDto.setReceivablesName("车款"); + unCollectionDto.setCustomerPhone(vo.getPhone()); + unCollectionDto.setUseOrgSid(vo.getUseOrgSid()); + unCollectionDto.setVinNo(vinList.get(i).getVinNo()); + unCollectionDto.setCurrentReceivableMoney(money); + unCollectionDto.setUserSid(busSalesOrder.getCreateBySid()); + unCollectionDto.setReveivableMoney(money); + unCollectionDto.setBusVinSid(vinList.get(i).getSid()); + unCollectionDto.setPayType(vo.getPayType()); + unCollectionDto.setPayTypeKey(vo.getPayTypeKey()); + unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName()); + unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid()); + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } + + } + /** * 获取上一环节信息 * @@ -3644,13 +3644,13 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),typeState); + IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); for (AppBusSalesOrderVo record : pagging.getRecords()) { record.setShowStopBtn(false); record.setShowContractBtn(false); @@ -4091,12 +4091,12 @@ public class BusSalesOrderService extends MybatisBaseService baseMiddlemanDetailsVoResultBean = baseMiddlemanFeign.fetchDetailsBySid(busSaleOrderVehicleOutVo.getIntermediarySid()); - if(baseMiddlemanDetailsVoResultBean.getData() != null){ + if (baseMiddlemanDetailsVoResultBean.getData() != null) { busSaleOrderVehicleOutVo.setIntermediaryCode(baseMiddlemanDetailsVoResultBean.getData().getMiddleCode()); } } //中介人2编码 - if(StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid2())){ + if (StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid2())) { ResultBean baseMiddlemanDetailsVoResultBean = baseMiddlemanFeign.fetchDetailsBySid(busSaleOrderVehicleOutVo.getIntermediarySid2()); - if(baseMiddlemanDetailsVoResultBean.getData() != null){ + if (baseMiddlemanDetailsVoResultBean.getData() != null) { busSaleOrderVehicleOutVo.setIntermediaryCode2(baseMiddlemanDetailsVoResultBean.getData().getMiddleCode()); } } 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 6a3df58c6c..3825268aaa 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 @@ -1362,8 +1362,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService