From 54d88e479f9777afd002f35628b429ec0de01791 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 31 May 2023 13:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busdelivered/BusDeliveredFeign.java | 5 + .../BusDeliveredFeignFallback.java | 5 + .../BusHandoverPrepareVehicleFeign.java | 2 +- .../BusArrearsCarryVehicleApplyService.java | 66 +++++++-- .../biz/busdelivered/BusDeliveredMapper.java | 2 + .../biz/busdelivered/BusDeliveredMapper.xml | 4 + .../biz/busdelivered/BusDeliveredRest.java | 5 + .../biz/busdelivered/BusDeliveredService.java | 6 + .../BusDeliveredApplyMapper.xml | 3 +- .../BusHandoverPrepareVehicleRest.java | 11 +- .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 4 + .../bussalesorder/BusSalesOrderService.java | 4 + .../BusSalesOrderVehicleMapper.java | 17 ++- .../BusSalesOrderVehicleMapper.xml | 8 ++ .../BusSalesOrderVehicleService.java | 10 ++ .../src/main/resources/ftl/gd.ftl | 11 +- .../src/main/resources/ftl/gd2.ftl | 50 +++---- .../FinCollectionConfirmationFeign.java | 4 + ...inCollectionConfirmationFeignFallback.java | 5 + .../FinBillApplicationService.java | 9 +- .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 8 ++ .../FinCollectionConfirmationRest.java | 5 + .../FinCollectionConfirmationService.java | 128 ++++++++++-------- 25 files changed, 251 insertions(+), 125 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java index d0fe4967bd..677f18f32e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java @@ -102,4 +102,9 @@ public interface BusDeliveredFeign { @PostMapping("/selectInfo") @ResponseBody ResultBean> selectInfo(@RequestBody DeliverDetailsQuery query); + + @ApiOperation("根据busVinSid查询待出库") + @GetMapping("/selectByBusVinSid") + @ResponseBody + ResultBean selectByBusVinSid(@RequestParam("busVinSid") String busVinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java index 30e0c70025..e3c18772f8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java @@ -90,4 +90,9 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { public ResultBean> selectInfo(DeliverDetailsQuery query) { return null; } + + @Override + public ResultBean selectByBusVinSid(String busVinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java index 530c12764f..d52f9e73bb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java @@ -48,7 +48,7 @@ import java.util.List; * @version 1.0 * @since 1.0 */ -@Api(tags = "交车准备-申请表") +@Api(tags = "交车准备车辆子表") @FeignClient( contextId = "anrui-buscenter-handover-BusHandoverPrepareVehicle", name = "anrui-buscenter", diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index df3ab7bd59..8854ac708e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; @@ -64,6 +65,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; @@ -187,6 +190,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid()); + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + if (solutionsDetailsVo != null) { + if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) { + //推送车款 + if ("02".equals(solutionsDetailsVo.getTypeKey())) { + //外部金融：单车整体成交价-厂家贴息+服务费 + wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice()).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount()))); + } else { + //自营非担保：实收合计 + wMoneyAll = wMoneyAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal())); + } + } else {//担保贷款: 实收合计 + wMoneyAll = wMoneyAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal())); + } + } else { + //推送车款：单车整体成交价 + wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice())); + } + } else { + //推送车款：单车整体成交价 + wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice())); + } + //总价款 + wMoneyAll = wMoneyAll.multiply(new BigDecimal(stringList.size())); + map.put("money", wMoneyAll.toString()); + //================================================= + /*if (StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())) { wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getTotalPrice())); - } - map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(appOrderPriceInfoVo.getTotalPrice()).doubleValue()))); - //根据合同号查询已经审核通过的总认款 - ResultBean subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(dto.getContractId()); + }*/ + map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(wMoneyAll.toString()).doubleValue()))); + BigDecimal sqMoney = BigDecimal.ZERO; + //已付车款 + List vinSidList = vinList.stream().map(v -> v.getCarSid()).collect(Collectors.toList()); + List busVinSidList = busSalesOrderVehicleService.selectByVinSidAndContractNo(vinSidList,dto.getContractId()); + ResultBean subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoneys(dto.getContractId(),busVinSidList); if (subscribtAllResultBean.getData() != null) { map.put("YMoney", subscribtAllResultBean.getData()); - wMoneyAll = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData())); + sqMoney = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData())); + }else{ + map.put("YMoney", BigDecimal.ZERO); + sqMoney = wMoneyAll.subtract(BigDecimal.ZERO); } - if (wMoneyAll.compareTo(BigDecimal.ZERO) < 0) { + //尚欠车款 + if (sqMoney.compareTo(BigDecimal.ZERO) <= 0) { map.put("wMoney", "0"); } else { - map.put("wMoney", wMoneyAll.toString()); + map.put("wMoney", sqMoney.toString()); } + //尚欠车款大写 if (StringUtils.isNotBlank(subscribtAllResultBean.getData())) { - map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(subscribtAllResultBean.getData()).doubleValue()))); + map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(sqMoney.toString()).doubleValue()))); } else { map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(String.valueOf(BigDecimal.ZERO)).doubleValue()))); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java index d786a055fb..d1f995498b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java @@ -94,4 +94,6 @@ public interface BusDeliveredMapper extends BaseMapper { IPage selectListsVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid); + + BusDelivered selectByBusVinSid(String busVinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 9296f12d82..3e7b632ddc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -121,4 +121,8 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java index 327c0aac68..c6f0fdf7ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java @@ -120,4 +120,9 @@ public class BusDeliveredRest implements BusDeliveredFeign { public ResultBean> selectInfo(DeliverDetailsQuery query) { return busDeliveredService.selectInfo(query); } + + @Override + public ResultBean selectByBusVinSid(String busVinSid) { + return busDeliveredService.selectByBusVinSid(busVinSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 043e687d54..5d225a1297 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -654,4 +654,10 @@ public class BusDeliveredService extends MybatisBaseService selectByBusVinSid(String busVinSid) { + ResultBean rb = ResultBean.fireFail(); + BusDelivered busDelivered = baseMapper.selectByBusVinSid(busVinSid); + return rb.success().setData(busDelivered); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 3e08f6b0a1..efc5d70e9e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -21,6 +21,7 @@ ${ew.sqlSegment} + order by bd.billNo desc @@ -62,7 +63,7 @@ , '%') - order by bd.id desc + order by bd.billNo desc diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java index 045741486c..11d57a3db5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,14 +34,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDetailsVo; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto; -import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign; - /** * Project: bus_handover(交车准备)
* File: BusHandoverPrepareVehicleFeignFallback.java
@@ -54,7 +47,7 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareV * @version 1.0 * @since 1.0 */ -@Api(tags = "交车准备-申请表") +@Api(tags = "交车准备车辆子表") @RestController("com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest") @RequestMapping("v1/bushandoverpreparevehicle") public class BusHandoverPrepareVehicleRest implements BusHandoverPrepareVehicleFeign { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index a781035d44..7d5c22dbd5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -209,4 +209,6 @@ public interface BusSalesOrderMapper extends BaseMapper { List selectQKBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid); List selectByContractNoToVin(String contractId); + + BusSalesOrder selectDetailsByContractNo(String contractId); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 6f3a013ecf..5beab7e636 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -418,4 +418,8 @@ select bv.sid from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid where bo.contractNo = #{contractId} + + \ No newline at end of file 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 9592987e2d..83e0600aa0 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 @@ -6576,4 +6576,8 @@ public class BusSalesOrderService extends MybatisBaseService selectListBySids(String sid); - int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo,@Param("temporaryName") String temporaryName); + int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo, @Param("temporaryName") String temporaryName); List selectByOrderSid(@Param("salesOrderSid") String salesOrderSid); @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}") BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid); - BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid); + BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid); List selectByNoAndVinSids(String contractNo); List appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); - List getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper qw); + List getCanUseCars(@Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Select("select * from bus_sales_order_vehicle where temporaryNo = #{fNumber}") BusSalesOrderVehicle fetchByLSBM(String fNumber); + + /** + * 欠款提车查询已选车辆的关联的销售订单的车辆sid + * + * @param vinSidList + * @param contractId + * @return + */ + List selectByVinSidAndContractNo(@Param("list") List vinSidList, @Param("contractNo") String contractId); } \ No newline at end of file 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 d2411fe764..b69cea9995 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 @@ -141,4 +141,12 @@ and length(bv.linkSid)>0 + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index c64900dcd9..e1098098bf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -480,4 +480,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectByVinSidAndContractNo(List vinSidList, String contractId) { + return baseMapper.selectByVinSidAndContractNo(vinSidList,contractId); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl index e6c70078d1..e6a4251c64 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl @@ -483,24 +483,21 @@ - - - - + - - + + - + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl index 2d11720fcb..a52f599e00 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl @@ -554,34 +554,25 @@ - - + + - + - - + + + - - - - - - - 公 - - - - - - - - + + + + + - 司股东会对外担保决议 + 公司股东会对外担保决议 @@ -728,7 +719,7 @@ - (合同) + @@ -1243,18 +1234,11 @@ - 年 - - - - - - - - - + + + @@ -1263,7 +1247,7 @@ - 月 日 + 年 月 日 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index fe356b8054..ed4541453f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -161,4 +161,8 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("更新已选择的款项明细的车架号") @PutMapping("/updateVin") ResultBean updateVin(@RequestParam("vinNo") String vinNo, @RequestParam("contractNo") String contractNo, @RequestParam("temporaryNo") String temporaryNo); + + @ApiOperation("欠款提车已选车辆的已认款") + @GetMapping("/selectCollectionMoneys") + ResultBean selectCollectionMoneys(@RequestParam("contractId") String contractId, @RequestParam("busVinSidList") List busVinSidList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index e6b93c075e..cb22445ba0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -172,4 +172,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { return null; } + + @Override + public ResultBean selectCollectionMoneys(String contractId, List busVinSidList) { + return null; + } } \ No newline at end of file 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 c4c05868de..395291ed00 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 @@ -31,7 +31,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign; -import com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo; import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; @@ -960,6 +959,14 @@ public class FinBillApplicationService extends MybatisBaseService busVinSidList); } \ 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 a0b340f979..3f0eb19cd4 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 @@ -184,4 +184,12 @@ contractNo = #{contractNo} and auditState = 3 + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 48258f2ef3..92073ec555 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -250,4 +250,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { return finCollectionConfirmationService.updateVin(vinNo, contractNo, temporaryNo); } + + @Override + public ResultBean selectCollectionMoneys(String contractId, List busVinSidList) { + return finCollectionConfirmationService.selectCollectionMoneys(contractId,busVinSidList); + } } 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 d9f07ead9a..2eabc37daa 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 @@ -41,6 +41,7 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; @@ -628,20 +629,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -1311,10 +1312,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService8){ + if (vvvv.getVIN().length() > 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -1498,7 +1499,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -1627,11 +1628,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid()); - if (sysOrganizationVoResultBean.getData() != null) { - busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + //根据busVinSid查询待出库中是否存在该数据 + ResultBean busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); + if(busDeliveredResultBean.getData() == null){ + if (leftAll.compareTo(rightAll) <= 0) {//推送待出库 + BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); + busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode()); + busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks()); + busDeliveredDto.setPaymentMethodKey(vo.getPayTypeKey()); + busDeliveredDto.setPaymentMethod(vo.getPayType()); + busDeliveredDto.setContractNo(v.getContractNo()); + busDeliveredDto.setName(v.getCustomerName()); + busDeliveredDto.setVinNo(v.getVIN()); + busDeliveredDto.setMobile(v.getCustomerPhone()); + busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice()); + busDeliveredDto.setCreateBySid(confirmation.getStaffUserSid()); + SubmitVo intermediary1 = vo.getIntermediary1(); + if (intermediary1 != null) { + busDeliveredDto.setDistributorName(intermediary1.getIntermediaryName()); + busDeliveredDto.setDistributorPrice(intermediary1.getAgencyFee()); + } + SubmitVo intermediary2 = vo.getIntermediary2(); + if (intermediary2 != null) { + busDeliveredDto.setDistributorNameTwo(intermediary2.getIntermediaryName()); + busDeliveredDto.setDistributorPriceTwo(intermediary2.getAgencyFee()); + } + busDeliveredDto.setSingleCarDiscountPrice(priceInfoVo.getSingleCarDiscountPrice()); + //根据客户sid查询客户的身份证号 + AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo(); + busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); + busDeliveredDto.setUseOrgSid(confirmation.getUseOrgSid()); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid()); + if (sysOrganizationVoResultBean.getData() != null) { + busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); + ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto); } - busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); - ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto); } + } } } @@ -2391,7 +2397,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -2526,7 +2532,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -2662,7 +2668,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -3853,7 +3859,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -3990,7 +3996,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=8){ + if (vvvv.getVIN().length() >= 8) { freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); } @@ -4246,13 +4252,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectCollectionMoneys(String contractId, List busVinSidList) { + ResultBean rb = ResultBean.fireFail(); + String moneyAll = baseMapper.selectCollectionMoneys(contractId,busVinSidList); + return rb.success().setData(moneyAll); + } } \ No newline at end of file