From 870d911dea5a979103ca8c724db18c2cfd31d14d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 26 Apr 2023 17:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 4 +- .../AdCarListVo.java | 13 +- .../AppAdvanceArrearsInfoQuery.java | 11 +- .../AppArrearsCarryInfoVo.java | 92 +++++++++- .../AppArrearsCarryVinDto.java | 94 +++++++++- .../BusArrearsCarryVehicleApply.java | 55 +++--- .../GCarListVo.java | 26 +++ .../BusSalesOrderVehicleFeign.java | 4 + .../BusSalesOrderVehicleFeignFallback.java | 5 + .../api/bussalesordervehicle/QCarQuery.java | 20 +++ .../api/bussalesordervehicle/QCarVo.java | 36 ++++ .../BusArrearsCarryVehicleApplyService.java | 164 ++++++++++++++--- .../bussalesorder/BusSalesOrderService.java | 13 +- .../BusSalesOrderVehicleMapper.java | 4 +- .../BusSalesOrderVehicleMapper.xml | 14 ++ .../BusSalesOrderVehicleRest.java | 10 +- .../BusSalesOrderVehicleService.java | 59 +++++- .../FinCollectionConfirmationFeign.java | 14 +- ...inCollectionConfirmationFeignFallback.java | 5 + .../FinSelectedReceivablesDetailedFeign.java | 10 +- ...ectedReceivablesDetailedFeignFallback.java | 5 + .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 6 + .../FinCollectionConfirmationRest.java | 5 + .../FinCollectionConfirmationService.java | 13 +- .../FinSelectedReceivablesDetailedMapper.java | 2 + .../FinSelectedReceivablesDetailedMapper.xml | 5 + .../FinSelectedReceivablesDetailedRest.java | 5 + ...FinSelectedReceivablesDetailedService.java | 6 + .../autoservice/approval/AppRovalFeign.java | 2 +- .../AdvanceArrearsInfoQuery.java | 11 +- .../arrearsTakeCar/AdvanceArrearsInfoVo.java | 170 +++++++++++++----- .../arrearsTakeCar/AdvanceArrearsVinDto.java | 95 +++++++++- .../AppBusArrearsCarryVehicleApplyFeign.java | 12 ++ ...ArrearsCarryVehicleApplyFeignFallback.java | 7 + .../arrearsTakeCar/AppCarListVo.java | 6 +- .../arrearsTakeCar/ArrearsCarVo.java | 18 ++ .../ArrearsCarryVehicleQuery.java | 2 +- .../arrearsTakeCar/GcCarListVo.java | 26 +++ .../AppBusArrearsCarryVehicleApplyRest.java | 7 +- ...AppBusArrearsCarryVehicleApplyService.java | 19 +- 41 files changed, 956 insertions(+), 121 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/GCarListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/GcCarListVo.java 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 13223599e6..56912546a9 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 @@ -1854,6 +1854,7 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + createOrgName = invoicingDetailsVoResultBean.getData().getName(); } else { return rb.setMsg("请与出纳人员联系完善开票信息"); } @@ -2017,6 +2018,7 @@ public class CommonContractService extends MybatisBaseService future3 = pool.submit(() -> { //新增合同信息 CommonContract commonContract = new CommonContract(); @@ -2041,7 +2043,7 @@ public class CommonContractService extends MybatisBaseService vinList = new ArrayList<>(); + + @ApiModelProperty("欠款提车挂车列表") + private List trailersList = new ArrayList<>(); + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("合同总金额") + private String contractMoney; + @ApiModelProperty("平台收款总金额") + private String contractCollectionMoney; + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java index c85a6ddee7..1a9beb91cd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java @@ -1,23 +1,111 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data public class AppArrearsCarryVinDto implements Dto { private static final long serialVersionUID = 4571956522478600189L; - @ApiModelProperty("用户sid") + /* @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("车架号集合") private List vinList; @ApiModelProperty("合同sid") - private String contractSid; + private String contractSid;*/ + + @ApiModelProperty("欠款提车申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("发起部门-发起人") + private String publishInfo; + @ApiModelProperty("发起日期") + private String createDate; + @ApiModelProperty("发起部门名称") + private String applyDept; + @ApiModelProperty("发起部门sid") + private String applyDeptSid; + @ApiModelProperty("申请人用户sid") + private String applyUserSid; + @ApiModelProperty("申请人名称") + private String applyName; + @ApiModelProperty("销售专员用户sid") + private String staffUserSid; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("销售专员部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门") + private String staffDept; + @ApiModelProperty("销售类型") + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("开票单位") + private String openTickName; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + //是否金融部复核 + @ApiModelProperty("是否金融部复核，1是，0否") + private String isFinance; + private String financeUserSid; + private String financeName; + + @ApiModelProperty("实例id") + @JsonProperty("procInsId") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + + @ApiModelProperty("欠款提车挂车列表") + private List trailersList = new ArrayList<>(); + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("合同总金额") + private String contractMoney; + @ApiModelProperty("平台收款总金额") + private String contractCollectionMoney; + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index 1ed5253ce7..82ffabb3be 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -27,56 +27,69 @@ import java.math.BigDecimal; public class BusArrearsCarryVehicleApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("客户名称") private String customerName; - + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("车型sid") private String modelSid; - + @ApiModelProperty("配置sid") + private String configSid; @ApiModelProperty("车型名称") private String modelName; - @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("合同总金额") private BigDecimal contractMoney; - @ApiModelProperty("合同收款金额") private BigDecimal contractCollectionMoney; - @ApiModelProperty("欠款金额") private BigDecimal arrearsMoney; - @ApiModelProperty("承诺回款日期") private String commitmentMoneyDate; - - @ApiModelProperty("申请日期") - private String applyDate; - @ApiModelProperty("申请人") private String applyName; - + @ApiModelProperty("申请人sid") + private String applyUserSid; + @ApiModelProperty("发起部门sid") + private String applyDeptSid; + @ApiModelProperty("发起部门名称") + private String applyDept; + @ApiModelProperty("销售专员用户sid") + private String staffUserSid; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("销售专员部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门") + private String staffDept; + @ApiModelProperty("销售类型") + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("开票单位") + private String openTickName; + @ApiModelProperty("是否金融部复核，1是，0否") + private String isFinance; + private String financeUserSid; + private String financeName; @ApiModelProperty("欠款提车原因") private String reason; - + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; @ApiModelProperty("累计欠款金额") private BigDecimal cumulativeArrearsMoney; - @ApiModelProperty("分公司sid") private String useOrgSid; - @ApiModelProperty("分公司名称") private String useOrgName; - @ApiModelProperty("状态") private String type; - @ApiModelProperty(value = "节点状态") private String nodeState; - @ApiModelProperty(value = "节点id") - private String nodeId; + @ApiModelProperty("节点id") + private String taskDefKey; @ApiModelProperty(value = "流程id") private String procDefId; @ApiModelProperty(value = "实例id") @@ -85,4 +98,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { private String taskId; @ApiModelProperty("当前用户部门的全路径") private String orgSidPath; + @ApiModelProperty("单台整体成交价") + private BigDecimal price; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/GCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/GCarListVo.java new file mode 100644 index 0000000000..1ae9862071 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/GCarListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/26 9:05 + * @Description + */ +@Data +public class GCarListVo implements Vo { + private static final long serialVersionUID = -3807840735114925033L; + + @ApiModelProperty("主车车架号") + private String vinNo; + @ApiModelProperty("挂车车架号") + private String gcVinNo; + + @ApiModelProperty("成交价") + private String price; + + @ApiModelProperty("平台已收款") + private String subscribedAll; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 7ee9921383..759bd5b474 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -83,4 +83,8 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("移动端-欠款开票选择车辆分页列表") @PostMapping("/appVehicleQKKPList") ResultBean> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query); + + @ApiOperation("欠款提车选择车辆") + @PostMapping("/getCanUseCars") + ResultBean> getCanUseCars(@RequestBody QCarQuery query); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 0f861aec0a..f685329d5f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -78,4 +78,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean> getCanUseCars(QCarQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java new file mode 100644 index 0000000000..5b22323a7a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bussalesordervehicle; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/26 14:56 + * @Description + */ +@Data +public class QCarQuery { + + @ApiModelProperty(value = "合同编号") + private String contractNo; + @ApiModelProperty(value = "车辆sid") + private List vinSids; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java new file mode 100644 index 0000000000..6d810ece69 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.buscenter.api.bussalesordervehicle; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/26 14:53 + * @Description + */ +@Data +public class QCarVo implements Vo { + private static final long serialVersionUID = 4862519509571252488L; + + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("平台已收款") + private String subscribedAll; + @ApiModelProperty("销售订单车辆sid") + @JsonIgnore + private String busVinSid; + + private AdCarListVo vinDto; + + private List gcList; +} 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 5984159fe6..1a4e365878 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 @@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,29 +14,28 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; 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.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeQuery; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeVo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto; -import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; -import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -140,6 +140,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService initArrearsApply(AppAdvanceArrearsInfoQuery query) { ResultBean rb = ResultBean.fireFail(); - String contractSid = query.getContractSid(); + AppArrearsCarryInfoVo appArrearsCarryInfoVo = new AppArrearsCarryInfoVo(); + //申请sid + String sid = query.getSid(); + if (StringUtils.isBlank(sid)) { + //申请部门名称 + String deptName = ""; + //申请部门sid + String deptSid = ""; + String orgPath = query.getOrgPath(); + String userSid = query.getUserSid(); + String contractNo = query.getContractNo(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + } + //根据用户sid查询人员姓名 + ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + appArrearsCarryInfoVo.setUserSid(userSid); + appArrearsCarryInfoVo.setOrgPath(orgPath); + appArrearsCarryInfoVo.setApplyName(userVoResultBean.getData().getName()); + appArrearsCarryInfoVo.setContractId(contractNo); + appArrearsCarryInfoVo.setApplyDept(deptName); + appArrearsCarryInfoVo.setApplyDeptSid(deptSid); + appArrearsCarryInfoVo.setApplyUserSid(userSid); + appArrearsCarryInfoVo.setStaffUserSid(userSid); + appArrearsCarryInfoVo.setStaffName(userVoResultBean.getData().getName()); + appArrearsCarryInfoVo.setStaffDeptSid(deptSid); + appArrearsCarryInfoVo.setStaffDept(deptName); + deptName = deptName + "-" + userVoResultBean.getData().getName(); + //移动端发起人信息 + appArrearsCarryInfoVo.setPublishInfo(deptName); + //根据合同编号查询销售订单的信息 + ResultBean resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo); + if (!resultBean.getSuccess()) { + log.error("获取销售订单详情出错啦！！！"); + return rb; + } + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + //销售类型 + appArrearsCarryInfoVo.setPaymentMethod(appOrderDetailsVo.getPayType()); + appArrearsCarryInfoVo.setPaymentMethodKey(appOrderDetailsVo.getPayTypeKey()); + //开票单位 + String createOrgName = ""; + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + createOrgName = invoicingDetailsVoResultBean.getData().getName(); + } else { + createOrgName = appOrderDetailsVo.getSalesOrg(); + } + } + appArrearsCarryInfoVo.setOpenTickName(createOrgName); + //客户名称 + appArrearsCarryInfoVo.setCustomerName(appOrderDetailsVo.getName()); + AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo(); + appArrearsCarryInfoVo.setModelName(appOrderModelInfoVo.getModelName()); + appArrearsCarryInfoVo.setModelSid(appOrderModelInfoVo.getModelSid()); + appArrearsCarryInfoVo.setConfigSid(appOrderModelInfoVo.getConfigSid()); + appArrearsCarryInfoVo.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + appArrearsCarryInfoVo.setCreateDate(DateUtil.today()); + //合同 + AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo(); + appArrearsCarryInfoVo.setContractMoney(appOrderPriceInfoVo.getTotalPrice()); + //根据合同号查询已经审核通过的总认款 + ResultBean subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(contractNo); + if(subscribtAllResultBean.getData() != null){ + appArrearsCarryInfoVo.setContractCollectionMoney(subscribtAllResultBean.getData()); + } + } else { + //查询欠款提车申请是否存在 + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(sid); + if (busArrearsCarryVehicleApply == null) { + return rb.setMsg("该欠款提车申请不存在"); + } + BeanUtil.copyProperties(busArrearsCarryVehicleApply, appArrearsCarryInfoVo, "sid"); + appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo()); + appArrearsCarryInfoVo.setPublishInfo(busArrearsCarryVehicleApply.getApplyDept() + "-" + busArrearsCarryVehicleApply.getApplyName()); + appArrearsCarryInfoVo.setCreateDate(DateUtil.format(busArrearsCarryVehicleApply.getCreateTime(), "yyyy-MM-dd")); + appArrearsCarryInfoVo.setOrgPath(busArrearsCarryVehicleApply.getOrgSidPath()); + + } + + + /* String contractSid = query.getContractSid(); String userSid = query.getUserSid(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); List carList = new ArrayList<>(); @@ -504,10 +604,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = dto.getVinList(); + if(adCarListVoList.isEmpty()){ + return rb.setMsg("请选择车辆"); + } + + + }else{ + //修改保存 + + } + return rb.success(); + + /* ResultBean rb = ResultBean.fireFail(); // 取出分公司sid String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); // 取出分公司名称 @@ -561,7 +683,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + createOrgName = invoicingDetailsVoResultBean.getData().getName(); + } + } commonContract.setPartyA(createOrgName); commonContract.setPartyB(customerName); //签订日期、签订地点 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 1777d7803a..23e305dcf5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -34,7 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo; -import com.yxt.common.core.result.ResultBean; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -115,4 +115,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByNoAndVinSids(String contractNo); List appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); + + List getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper qw); } \ 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 68f6397e92..65031b1d82 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 @@ -109,4 +109,18 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 7aa2614529..12286e9bde 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -25,10 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesordervehicle; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPQuery; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -90,5 +87,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.appVehicleQKKPList(query); } + @Override + public ResultBean> getCanUseCars(QCarQuery query) { + return busSalesOrderVehicleService.getCanUseCars(query); + } + } 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 c1b1ad7048..45f45efcfd 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 @@ -33,6 +33,8 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPTrailerVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; @@ -42,7 +44,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -76,6 +78,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { @@ -222,7 +226,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectByNoAndVinSids(String contractNo) { @@ -251,8 +255,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> appVehicleQKKPList(BusVehicleQKKPQuery query) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("bso.contractNo",query.getContractNo()); - if (query.getVinSids() != null){ + qw.eq("bso.contractNo", query.getContractNo()); + if (query.getVinSids() != null) { if (query.getVinSids().size() > 0) { qw.notIn("bsov.linkSid", query.getVinSids()); } @@ -267,7 +271,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService trailerVos = traliveredVo.getList(); - if (trailerVos != null && trailerVos.size() > 0){ + if (trailerVos != null && trailerVos.size() > 0) { for (TrailerVo trailerVo : trailerVos) { BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); @@ -282,4 +286,45 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> getCanUseCars(QCarQuery query) { + ResultBean> rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + if (query.getVinSids() != null) { + if (query.getVinSids().size() > 0) { + qw.notIn("bv.linkSid", query.getVinSids()); + } + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("bo.contractNo", query.getContractNo()); + } + List list = baseMapper.getCanUseCars(qw); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + QCarVo qCarVo = list.get(i); + AdCarListVo adCarListVo = new AdCarListVo(); + BeanUtil.copyProperties(qCarVo, adCarListVo); + //查询该车辆已收款 + ResultBean stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid()); + if (stringResultBean.getData() != null) { + adCarListVo.setSubscribedAll(stringResultBean.getData()); + } + List gcList = new ArrayList<>(); + TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData(); + List trailerVos = traliveredVo.getList(); + if (!trailerVos.isEmpty()) { + for (TrailerVo trailerVo : trailerVos) { + GCarListVo gCarListVo = new GCarListVo(); + gCarListVo.setVinNo(traliveredVo.getVinNo()); + gCarListVo.setGcVinNo(trailerVo.getTrailerVinNo()); + gCarListVo.setPrice(trailerVo.getDealPrice()); + gcList.add(gCarListVo); + } + qCarVo.setGcList(gcList); + } + } + } + return rb.success().setData(list); + } } \ No newline at end of file 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 5c58e4828b..79e0f6bac9 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 @@ -36,6 +36,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; import java.util.List; @@ -83,7 +84,7 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("出纳确认") @PostMapping("/cashierConfirm") - public ResultBean cashierConfirm(@RequestParam("sid") String sid,@RequestParam("userSid")String userSid); + public ResultBean cashierConfirm(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid); @ApiOperation("出纳驳回") @PostMapping("/cashierReject") @@ -92,7 +93,7 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("生成收款单pdf") @PostMapping("/createPdf") @ResponseBody - ResultBean createPdf(@RequestParam("skdSid") String skdSid,@RequestParam("printerType") String printerType); + ResultBean createPdf(@RequestParam("skdSid") String skdSid, @RequestParam("printerType") String printerType); @ApiOperation("重推收款单") @PostMapping("/ctskd") @@ -138,17 +139,22 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("欠款提车-查询欠款金额及收款金额") @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}") + @ApiIgnore ResultBean selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo); + @ApiOperation("欠款提车查询收款金额") + @GetMapping("/selectCollectionMoney") + ResultBean selectCollectionMoney(@RequestParam("contractNo") String contractNo); + @ApiOperation("根据业务sid查询款项信息") @GetMapping("/selectByBusSid") ResultBean selectByBusSid(@RequestParam("virtualOrderSid") String virtualOrderSid); @ApiOperation("根据分公司sid获取收款单编号") @GetMapping("/getApplyCode") - ResultBean getApplyCode(@RequestParam("useOrgSid")String useOrgSid); + ResultBean getApplyCode(@RequestParam("useOrgSid") String useOrgSid); @ApiOperation("更新已选择的款项明细的车架号") @PutMapping("/updateVin") - ResultBean updateVin(@RequestParam("vinNo")String vinNo,@RequestParam("contractNo")String contractNo,@RequestParam("temporaryNo")String temporaryNo); + ResultBean updateVin(@RequestParam("vinNo") String vinNo, @RequestParam("contractNo") String contractNo, @RequestParam("temporaryNo") String temporaryNo); } \ 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 c95315e786..43d1fc5989 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 @@ -148,6 +148,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf return null; } + @Override + public ResultBean selectCollectionMoney(String contractNo) { + return null; + } + @Override public ResultBean selectByBusSid(String virtualOrderSid) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index 60eda3b0de..a28fa7ca4d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -29,10 +29,7 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -72,4 +69,9 @@ public interface FinSelectedReceivablesDetailedFeign { @ApiOperation("根据合同编号查询") @PostMapping("/fetchByReceivablesSid") public ResultBean> fetchByReceivablesSid(@RequestParam("receivablesSid") String receivablesSid); + + @ApiOperation("查询车辆已收款") + @GetMapping("/selectByBusVinSid") + ResultBean selectByBusVinSid(@RequestParam("busVinSid") String busVinSid); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index 3cd99a162c..f998a103af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java @@ -66,4 +66,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR return null; } + @Override + public ResultBean selectByBusVinSid(String busVinSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 7ff09e0da4..1a518104dc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -116,4 +116,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo} + + \ 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 087e7e682a..b3f3cd80a5 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 @@ -224,6 +224,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo); } + @Override + public ResultBean selectCollectionMoney(String contractNo) { + return finCollectionConfirmationService.selectCollectionMoney(contractNo); + } + @Override public ResultBean selectByBusSid(String virtualOrderSid) { return finCollectionConfirmationService.selectByBusSid(virtualOrderSid); 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 f271af2230..a76588da07 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 @@ -1814,7 +1814,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService selectCollectionMoney(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + String moneyAll = baseMapper.selectCollectionMoney(contractNo); + return rb.success().setData(moneyAll); + } } \ 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 8e3d2276dc..7d9d520ed6 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 @@ -123,4 +123,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper fetchByContractNo(String contractNo); @Select("select * from fin_selected_receivables_detailed where receivablesSid = #{receivablesSid} and auditState = 3") List fetchByReceivablesSid(String receivablesSid); + + String selectByVinSid(String busVinSid); } \ 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 483d9f3f8a..8d7ea32564 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 @@ -225,4 +225,9 @@ and length(VIN) = 0 + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index d924bebaa7..4a855cdd41 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java @@ -85,4 +85,9 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable return finSelectedReceivablesDetailedService.fetchByReceivablesSid(receivablesSid); } + @Override + public ResultBean selectByBusVinSid(String busVinSid) { + return finSelectedReceivablesDetailedService.selectByBusVinSid(busVinSid); + } + } 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 84b777b1bb..943e51a38a 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 @@ -262,4 +262,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService finSelectedReceivablesDetaileds = baseMapper.fetchByReceivablesSid(receivablesSid); return rb.success().setData(finSelectedReceivablesDetaileds); } + + public ResultBean selectByBusVinSid(String busVinSid) { + ResultBean rb = ResultBean.fireFail(); + String sumAll = baseMapper.selectByVinSid(busVinSid); + return rb.success().setData(sumAll); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java index e3807b9aaf..4049f90402 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java @@ -31,7 +31,7 @@ import java.util.List; fallback = AppRovalFeignFallback.class) public interface AppRovalFeign { - @ApiOperation("移动端-提前开票查询合同列表") + @ApiOperation("移动端-提前开票、欠款提车查询合同列表") @PostMapping("/getApprovalContractList") @ResponseBody public ResultBean> getApprovalContractList(@RequestBody PagerQuery pagerQuery); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java index c632c30b16..cb84598d83 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java @@ -8,9 +8,18 @@ import lombok.Data; public class AdvanceArrearsInfoQuery implements Query { private static final long serialVersionUID = -8535705004903885760L; - @ApiModelProperty("申请sid") + /* @ApiModelProperty("申请sid") private String contractSid; + @ApiModelProperty("用户sid") + private String userSid;*/ + + @ApiModelProperty("申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractNo; @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java index 6a3d607a35..03038f4060 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java @@ -13,50 +13,140 @@ import java.util.List; public class AdvanceArrearsInfoVo implements Vo { private static final long serialVersionUID = 6617819819692518547L; - @ApiModelProperty("用户sid") - private String userSid; - @ApiModelProperty("合同sid") - @JsonProperty("contractSid") - private String contractSid; - @ApiModelProperty("合同id") - @JsonProperty("contractId") - private String contractNo; - @ApiModelProperty("收款金额") - @JsonProperty("collectedPrice") - private String contractCollectionMoney; - @ApiModelProperty("合同金额") - @JsonProperty("contractPrice") - private String contractMoney; + /* @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + @JsonProperty("contractSid") + private String contractSid; + @ApiModelProperty("合同id") + @JsonProperty("contractId") + private String contractNo; + @ApiModelProperty("收款金额") + @JsonProperty("collectedPrice") + private String contractCollectionMoney; + @ApiModelProperty("合同金额") + @JsonProperty("contractPrice") + private String contractMoney; + @ApiModelProperty("车型") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + @JsonProperty("applicationDate") + private String applyDate; + @ApiModelProperty("回款日期") + @JsonProperty("paymentDate") + private String commitmentMoneyDate; + @ApiModelProperty("欠款金额") + @JsonProperty("cumulativeArrearsPrice") + private String arrearsMoney; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("选择车辆列表") + private List carList = new ArrayList<>(); + @ApiModelProperty("所有车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("节点状态") + private String nodeState; + @ApiModelProperty("节点id") + private String nodeId; + */ + @ApiModelProperty("欠款提车申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("发起部门-发起人") + private String publishInfo; + @ApiModelProperty("发起日期") + @JsonProperty("date") + private String createDate; + private String applyDept; + private String applyDeptSid; + private String applyUserSid; + private String applyName; + private String staffUserSid; + @JsonProperty("sellerName") + private String staffName; + private String staffDeptSid; + @ApiModelProperty("销售部门") + @JsonProperty("sellerDept") + private String staffDept; + @JsonProperty("saleType") + @ApiModelProperty("销售类型") + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("开票单位") + private String openTickName; + @ApiModelProperty("客户名称") + @JsonProperty("name") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("车型") @JsonProperty("model") private String modelName; - @ApiModelProperty("客户") - private String customerName; - @ApiModelProperty("申请日期") - @JsonProperty("applicationDate") - private String applyDate; - @ApiModelProperty("回款日期") - @JsonProperty("paymentDate") - private String commitmentMoneyDate; - @ApiModelProperty("欠款金额") - @JsonProperty("cumulativeArrearsPrice") - private String arrearsMoney; - @ApiModelProperty("欠款提车原因") - private String reason; - @ApiModelProperty("选择车辆列表") - private List carList = new ArrayList<>(); - @ApiModelProperty("所有车辆列表") - private List vinList = new ArrayList<>(); - @ApiModelProperty("任务id") - private String taskId; - @ApiModelProperty("流程实例id") + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + //是否金融部复核 + @ApiModelProperty("是否金融部复核，1是，0否") + private String isFinance; + @ApiModelProperty("金融人员用户sid") + private String financeUserSid; + @ApiModelProperty("金融人员名称") + private String financeName; + + @ApiModelProperty("实例id") @JsonProperty("procInsId") private String procInstId; - @ApiModelProperty("流程定义id") - private String procDefId; - @ApiModelProperty("节点状态") - private String nodeState; - @ApiModelProperty("节点id") - private String nodeId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + + @ApiModelProperty("欠款提车挂车列表") + private List trailersList = new ArrayList<>(); + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("原因备注") + @JsonProperty("remarks") + private String reason; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("合同总金额") + private String contractMoney; + @ApiModelProperty("平台收款总金额") + private String contractCollectionMoney; + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java index 0619f9c35d..b8b5a48898 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java @@ -1,22 +1,113 @@ package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data public class AdvanceArrearsVinDto implements Dto { private static final long serialVersionUID = -6803789056412970209L; - @ApiModelProperty("用户sid") + /* @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("车架号集合") private List vinList; @ApiModelProperty("合同sid") - private String contractSid; + private String contractSid;*/ + + @ApiModelProperty("欠款提车申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("发起部门-发起人") + private String publishInfo; + @ApiModelProperty("发起日期") + @JsonProperty("date") + private String createDate; + private String applyDept; + private String applyDeptSid; + private String applyUserSid; + private String applyName; + private String staffUserSid; + @JsonProperty("sellerName") + private String staffName; + private String staffDeptSid; + @ApiModelProperty("销售部门") + @JsonProperty("sellerDept") + private String staffDept; + @JsonProperty("saleType") + @ApiModelProperty("销售类型") + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("开票单位") + private String openTickName; + @ApiModelProperty("客户名称") + @JsonProperty("name") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("车型") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + //是否金融部复核 + @ApiModelProperty("是否金融部复核，1是，0否") + private String isFinance; + @ApiModelProperty("金融人员用户sid") + private String financeUserSid; + @ApiModelProperty("金融人员名称") + private String financeName; + + @ApiModelProperty("实例id") + @JsonProperty("procInsId") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + + @ApiModelProperty("欠款提车挂车列表") + private List trailersList = new ArrayList<>(); + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("原因备注") + @JsonProperty("remarks") + private String reason; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("合同总金额") + private String contractMoney; + @ApiModelProperty("平台收款总金额") + private String contractCollectionMoney; + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java index d900aad1b9..7fd8e0f129 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java @@ -14,6 +14,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * Project: bus(bus)
@@ -51,6 +52,17 @@ public interface AppBusArrearsCarryVehicleApplyFeign { @ResponseBody public ResultBean initArrearsApply(@SpringQueryMap AdvanceArrearsInfoQuery query); + /** + * 选择车辆列表 + * @param contractNo 合同编号 + * @param vinSids 已选择的车辆sid集合 + * @return + */ + @ApiOperation("选择车辆列表") + @GetMapping("/getCanUseCars") + @ResponseBody + ResultBean> getCanUseCars(@RequestParam("contractNo") String contractNo, @RequestParam("vinSids") List vinSids); + @ApiOperation("移动端-保存欠款提车申请") @PostMapping("/saveArrearsApply") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java index 4909494d24..a97a6d348e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java @@ -9,6 +9,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: bus(bus)
* File: BusArrearsCarryVehicleApplyFeignFallback.java
@@ -40,6 +42,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear return null; } + @Override + public ResultBean> getCanUseCars(String contractNo, List vinSids) { + return null; + } + @Override public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java index 872d395f97..5e797d70e6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java @@ -17,8 +17,10 @@ public class AppCarListVo implements Vo { @ApiModelProperty("成交价") private String price; - @ApiModelProperty("备注") - private String remarks; + /*@ApiModelProperty("备注") + private String remarks;*/ + @ApiModelProperty("平台已收款") + private String subscribedAll; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarVo.java new file mode 100644 index 0000000000..505b48e2a2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/26 14:47 + * @Description + */ +@Data +public class ArrearsCarVo { + + private AppCarListVo vinDto; + + private List gcList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java index a4d793da8d..ce146312ac 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java @@ -14,7 +14,7 @@ public class ArrearsCarryVehicleQuery implements Query { @ApiModelProperty("客户名称 合同编号") private String name; - @ApiModelProperty("状态") + @ApiModelProperty("状态：1待办理、2已办理") private String type; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/GcCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/GcCarListVo.java new file mode 100644 index 0000000000..6f08d9c4c0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/GcCarListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/26 8:47 + * @Description + */ +@Data +public class GcCarListVo implements Vo { + private static final long serialVersionUID = -8112159947722358724L; + + @ApiModelProperty("主车车架号") + private String vinNo; + @ApiModelProperty("挂车车架号") + private String gcVinNo; + + @ApiModelProperty("成交价") + private String price; + + @ApiModelProperty("平台已收款") + private String subscribedAll; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java index b53f736cec..aa9cf48bac 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java @@ -57,13 +57,18 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh return appBusArrearsCarryVehicleApplyService.initArrearsApply(query); } + @Override + public ResultBean> getCanUseCars(String contractNo, List vinSids) { + return appBusArrearsCarryVehicleApplyService.getCanUseCars(contractNo, vinSids); + } + @Override public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { return appBusArrearsCarryVehicleApplyService.saveArrearsApply(dto); } @Override - public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) { + public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) { return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 2aa553699b..c37135de35 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -5,12 +5,15 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarQuery; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; 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.terminal.api.autoservice.arrearsTakeCar.*; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; @@ -52,6 +55,8 @@ public class AppBusArrearsCarryVehicleApplyService { private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; public ResultBean> getArrearsTakeCarList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -221,4 +226,16 @@ public class AppBusArrearsCarryVehicleApplyService { } + public ResultBean> getCanUseCars(String contractNo, List vinSids) { + ResultBean> rb = ResultBean.fireFail(); + QCarQuery qCarQuery = new QCarQuery(); + qCarQuery.setContractNo(contractNo); + qCarQuery.setVinSids(vinSids); + ResultBean> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ArrearsCarVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file