Merge remote-tracking branch 'origin/master'

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<CommonContractMapp
             ResultBean<FinCompanyInvoicingDetailsVo> 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<CommonContractMapp
                 String finalUrlAll = urlAll;
                 String finalAddress = address;
                 String finalContractNo = contractNo;
+                String finalCreateOrgName = createOrgName;
                 Future<String> future3 = pool.submit(() -> {
                     //新增合同信息
                     CommonContract commonContract = new CommonContract();
@@ -2041,7 +2043,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //业务表sid
                     commonContract.setBusSid(dto.getBusSid());
                     //甲方名称、乙方名称、其他方名称、
-                    commonContract.setPartyA(createOrgName);
+                    commonContract.setPartyA(finalCreateOrgName);
                     commonContract.setPartyB(customerName);
                     //签订日期、签订地点
                     commonContract.setCreateDate(new Date());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java

@@ -8,12 +8,21 @@ import lombok.Data;
 public class AdCarListVo implements Vo {
     private static final long serialVersionUID = -1495695891564098295L;
 
-    @ApiModelProperty("车辆sid")
+  /*  @ApiModelProperty("车辆sid")
     private String carSid;
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("成交价")
     private String price;
     @ApiModelProperty("备注")
-    private String remarks;
+    private String remarks;*/
+
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("平台已收款")
+    private String subscribedAll;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java

@@ -8,9 +8,18 @@ import lombok.Data;
 public class AppAdvanceArrearsInfoQuery implements Query {
     private static final long serialVersionUID = -9121199885742205263L;
 
-    @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;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +12,7 @@ import java.util.List;
 public class AppArrearsCarryInfoVo implements Vo {
     private static final long serialVersionUID = -3423056894840667092L;
 
-    @ApiModelProperty("用户sid")
+    /*@ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("合同sid")
     private String contractSid;
@@ -48,6 +49,93 @@ public class AppArrearsCarryInfoVo implements Vo {
     @ApiModelProperty("节点状态")
     private String nodeState;
     @ApiModelProperty("节点id")
-    private String nodeId;
+    private String nodeId;*/
+
+    @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<AdCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> 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<String> fileList = new ArrayList<>();
 
 }

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<String> 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<AdCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> 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<String> fileList = new ArrayList<>();
 
 }

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;
 }

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;
+}

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<List<BusVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query);
+
+    @ApiOperation("欠款提车选择车辆")
+    @PostMapping("/getCanUseCars")
+    ResultBean<List<QCarVo>> getCanUseCars(@RequestBody QCarQuery query);
 }

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<List<QCarVo>> getCanUseCars(QCarQuery query) {
+        return null;
+    }
+
 }

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<String> vinSids;
+}

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<GCarListVo> gcList;
+}

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<BusAr
 
     @Autowired
     private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
 
     /**
      * 欠款提车分页列表查询条件
@@ -448,13 +450,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        String contractSid = query.getContractSid();
-        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid);
+        String sid = query.getSid();
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(sid);
         if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getNodeState())) {
             return rb.setMsg("该申请已提交，删除失败");
         }
-        deleteBySid(contractSid);
-        busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(contractSid);
+        deleteBySid(sid);
+        busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(sid);
         return rb.success();
     }
 
@@ -474,7 +476,105 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
 
     public ResultBean<AppArrearsCarryInfoVo> 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<String> 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<SysUserVo> 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<AppOrderDetailsVo> 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<FinCompanyInvoicingDetailsVo> 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<String> 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<AdCarListVo> carList = new ArrayList<>();
@@ -504,10 +604,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 AdCarListVo adCarListVo = new AdCarListVo();
                 //adCarListVo.setVin(appRovalContractPageVo.getVin());
                 //获取车辆sid
-                /*BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
+                *//*BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
                 if (baseVehicle != null) {
                     adCarListVo.setCarSid(baseVehicle.getSid());
-                }*/
+                }*//*
                 CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
                 if (commonContractVo != null) {
                     adCarListVo.setPrice(commonContractVo.getPrice());
@@ -516,8 +616,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
         }
         vo.setVinList(vinList);
-        vo.setContractSid(contractSid);
-        return rb.success().setData(vo);
+        vo.setContractSid(contractSid);*/
+        return rb.success().setData(appArrearsCarryInfoVo);
     }
 
     /**
@@ -528,6 +628,28 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
      */
     public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if(StringUtils.isBlank(sid)){
+            //新增保存
+            BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = new BusArrearsCarryVehicleApply();
+            BeanUtil.copyProperties(dto,busArrearsCarryVehicleApply,"sid");
+            busArrearsCarryVehicleApply.setOrgSidPath(dto.getOrgPath());
+            busArrearsCarryVehicleApply.setCreateBySid(dto.getUserSid());
+
+            //车辆
+            List<AdCarListVo> 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<BusAr
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = new BusArrearsCarryVehicleApply();
         busArrearsCarryVehicleApply.setCreateBySid(dto.getUserSid());//创建人sid
         busArrearsCarryVehicleApply.setApplyName(sysUserVo.getName());//申请人
-        busArrearsCarryVehicleApply.setApplyDate(sf.format(new Date()));//申请日期
         busArrearsCarryVehicleApply.setUseOrgSid(useOrgSid);//分公司sid
         busArrearsCarryVehicleApply.setUseOrgName(sysOrganizationVo.getName());//分公司名称
         busArrearsCarryVehicleApply.setModelSid(modelSid);// 车型sid
@@ -594,6 +715,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         save(busArrearsCarryVehicleApply);
         return rb.success().setData(busArrearsCarryVehicleApply.getSid());
+        */
     }
 
     /**
@@ -739,7 +861,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 return rb.setMsg("参数错误：instanceId");
             }
             bv.setTaskId(busArrearsCarryVehicleApply.getTaskId());
-            bv.setTaskDefKey(busArrearsCarryVehicleApply.getNodeId());
+            bv.setTaskDefKey(busArrearsCarryVehicleApply.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -119,6 +119,8 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
@@ -285,6 +287,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private SysStaffinfoFeign sysStaffinfoFeign;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
 
     /**
      * 构造查询条件
@@ -2824,8 +2828,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
                         return rb.setMsg("金融方案中实收金额小于单台订金");
                     }
-
                 }
+            }else{
+                return rb.setMsg("此销售类型下金融方案不能为空");
             }
         }
         return rb.success();
@@ -4673,6 +4678,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //业务表sid
         commonContract.setBusSid(sid);
         //甲方名称、乙方名称、其他方名称、
+        if(StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())){
+            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
+            if (invoicingDetailsVoResultBean.getData() != null) {
+                createOrgName = invoicingDetailsVoResultBean.getData().getName();
+            }
+        }
         commonContract.setPartyA(createOrgName);
         commonContract.setPartyB(customerName);
         //签订日期、签订地点

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<BusSalesOrderVehi
     List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
 
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    List<QCarVo> getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper<BaseVehicle> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -109,4 +109,18 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getCanUseCars" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo">
+        select bv.linkNo as vin,
+        bv.linkSid carSid,
+        bm.finalPrice as price,
+        bv.sid busVinSid
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid)>0
+        </where>
+    </select>
 </mapper>

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<List<QCarVo>> getCanUseCars(QCarQuery query) {
+        return busSalesOrderVehicleService.getCanUseCars(query);
+    }
+
 
 }

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<BusSalesOrde
     @Autowired
     private BaseTrailerFeign baseTrailerFeign;
     @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
+    @Autowired
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
@@ -222,7 +226,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
 
     public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.updateTemporaryNo(sid,temporaryNo);
+        baseMapper.updateTemporaryNo(sid, temporaryNo);
         return rb.success();
     }
 
@@ -236,8 +240,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return rb.success().setData(busSalesOrderVehicle);
     }
 
-    public BusSalesOrderVehicle selectByNoAndVinSid(String contractNo,String vinSid){
-        return baseMapper.selectByNoAndVinSid(contractNo,vinSid);
+    public BusSalesOrderVehicle selectByNoAndVinSid(String contractNo, String vinSid) {
+        return baseMapper.selectByNoAndVinSid(contractNo, vinSid);
     }
 
     public List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo) {
@@ -251,8 +255,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> 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<BusSalesOrde
                 busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
                 TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
                 List<TrailerVo> 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<BusSalesOrde
         }
         return rb.success().setData(busVehicleQKKPVosNew);
     }
+
+    public ResultBean<List<QCarVo>> getCanUseCars(QCarQuery query) {
+        ResultBean<List<QCarVo>> rb = ResultBean.fireFail();
+        QueryWrapper<BaseVehicle> 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<QCarVo> 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<String> stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid());
+                if (stringResultBean.getData() != null) {
+                    adCarListVo.setSubscribedAll(stringResultBean.getData());
+                }
+                List<GCarListVo> gcList = new ArrayList<>();
+                TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData();
+                List<TrailerVo> 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);
+    }
 }

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<PdfPath> createPdf(@RequestParam("skdSid") String skdSid,@RequestParam("printerType") String printerType);
+    ResultBean<PdfPath> 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<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo);
 
+    @ApiOperation("欠款提车查询收款金额")
+    @GetMapping("/selectCollectionMoney")
+    ResultBean<String> selectCollectionMoney(@RequestParam("contractNo") String contractNo);
+
     @ApiOperation("根据业务sid查询款项信息")
     @GetMapping("/selectByBusSid")
     ResultBean<FinCollectionConfirmation> selectByBusSid(@RequestParam("virtualOrderSid") String virtualOrderSid);
 
     @ApiOperation("根据分公司sid获取收款单编号")
     @GetMapping("/getApplyCode")
-    ResultBean<String> getApplyCode(@RequestParam("useOrgSid")String useOrgSid);
+    ResultBean<String> 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);
 }

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<String> selectCollectionMoney(String contractNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<FinCollectionConfirmation> selectByBusSid(String virtualOrderSid) {
         return null;

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<List<FinSelectedReceivablesDetailed>> fetchByReceivablesSid(@RequestParam("receivablesSid") String receivablesSid);
+
+    @ApiOperation("查询车辆已收款")
+    @GetMapping("/selectByBusVinSid")
+    ResultBean<String> selectByBusVinSid(@RequestParam("busVinSid") String busVinSid);
+
 }

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<String> selectByBusVinSid(String busVinSid) {
+		return null;
+	}
+
 }

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<FinCollectio
 
     @Update("update fin_collection_confirmation set downNum = #{downNum} where sid = #{skdSid}")
     void updateDown(@Param("skdSid") String skdSid,@Param("downNum") String downNum);
+
+    String selectCollectionMoney(String contractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -178,4 +178,10 @@
     <update id="updateVin">
         update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo}
     </update>
+
+    <select id="selectCollectionMoney" resultType="java.lang.String">
+        select sum(subscriptionMoney) from fin_selected_receivables_detailed where
+        contractNo = #{contractNo} and auditState = 3
+
+    </select>
 </mapper>

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<String> selectCollectionMoney(String contractNo) {
+        return finCollectionConfirmationService.selectCollectionMoney(contractNo);
+    }
+
     @Override
     public ResultBean<FinCollectionConfirmation> selectByBusSid(String virtualOrderSid) {
         return finCollectionConfirmationService.selectByBusSid(virtualOrderSid);

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<FinColl
                     arReceivebill.setF_PAEZ_AssistantKey("002");
                 }
                 arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
-                if (finSelectedReceivablesDetailedVos1_1_2.size() == 1 && finSelectedReceivablesDetailedVos1.size() == 0 && finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos1_1_1.size() == 0 && finSelectedReceivablesDetailedVos1_1.size() == 0) {
+                if (finSelectedReceivablesDetailedVos1_1_2.size() == 1 &&
+                        finSelectedReceivablesDetailedVos1.size() == 0 &&
+                        finSelectedReceivablesDetailedVos2.size() == 0 &&
+                        finSelectedReceivablesDetailedVos1_1_1.size() == 0 &&
+                        finSelectedReceivablesDetailedVos1_1.size() == 0 &&
+                        finSelectedReceivablesDetailedVos2_1.size() == 0) {
                     arReceivebill.setFBillNo(confirmation.getBillNo());
                 } else {
                     //单据编号
@@ -2683,4 +2688,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success();
     }
+
+    public ResultBean<String> selectCollectionMoney(String contractNo) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String moneyAll = baseMapper.selectCollectionMoney(contractNo);
+        return rb.success().setData(moneyAll);
+    }
 }

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<FinSele
     List<FinSelectedReceivablesDetailed> fetchByContractNo(String contractNo);
     @Select("select * from fin_selected_receivables_detailed where receivablesSid = #{receivablesSid} and auditState = 3")
     List<FinSelectedReceivablesDetailed> fetchByReceivablesSid(String receivablesSid);
+
+    String selectByVinSid(String busVinSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -225,4 +225,9 @@
           and length(VIN) = 0
     </select>
 
+    <select id="selectByVinSid" resultType="java.lang.String">
+        select sum(fd.subscriptionMoney) from fin_selected_receivables_detailed fd
+        left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
+        where ff.busVinSid = #{busVinSid} and fd.auditState = 3
+    </select>
 </mapper>

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<String> selectByBusVinSid(String busVinSid) {
+		return finSelectedReceivablesDetailedService.selectByBusVinSid(busVinSid);
+	}
+
 }

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<Fi
         List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = baseMapper.fetchByReceivablesSid(receivablesSid);
         return rb.success().setData(finSelectedReceivablesDetaileds);
     }
+
+    public ResultBean<String> selectByBusVinSid(String busVinSid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sumAll = baseMapper.selectByVinSid(busVinSid);
+        return rb.success().setData(sumAll);
+    }
 }

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<PagerVo<RovalContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<RovalContractPageQuery> pagerQuery);

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;
 }

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<AppCarListVo> carList = new ArrayList<>();
+     @ApiModelProperty("所有车辆列表")
+     private List<AppCarListVo> 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<AppCarListVo> carList = new ArrayList<>();
-    @ApiModelProperty("所有车辆列表")
-    private List<AppCarListVo> 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<AppCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GcCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> 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<String> fileList = new ArrayList<>();
+
 
 }

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<String> 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<AppCarListVo> vinList = new ArrayList<>();
+
+    @ApiModelProperty("欠款提车挂车列表")
+    private List<GcCarListVo> trailersList = new ArrayList<>();
+
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carContract = new ArrayList<>();
+    @ApiModelProperty("欠款提车担保承诺书")
+    private List<String> guaranteeLetter = new ArrayList<>();
+    @ApiModelProperty("股东会对外担保决议")
+    private List<String> gdLetter = new ArrayList<>();
+    @ApiModelProperty("总经理担保书")
+    private List<String> 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<String> fileList = new ArrayList<>();
 
 }

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) <br/>
@@ -51,6 +52,17 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @ResponseBody
     public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(@SpringQueryMap AdvanceArrearsInfoQuery query);
 
+    /**
+     * 选择车辆列表
+     * @param contractNo 合同编号
+     * @param vinSids 已选择的车辆sid集合
+     * @return
+     */
+    @ApiOperation("选择车辆列表")
+    @GetMapping("/getCanUseCars")
+    @ResponseBody
+    ResultBean<List<ArrearsCarVo>> getCanUseCars(@RequestParam("contractNo") String contractNo, @RequestParam("vinSids") List<String> vinSids);
+
     @ApiOperation("移动端-保存欠款提车申请")
     @PostMapping("/saveArrearsApply")
     @ResponseBody

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) <br/>
  * File: BusArrearsCarryVehicleApplyFeignFallback.java <br/>
@@ -40,6 +42,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
         return null;
     }
 
+    @Override
+    public ResultBean<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> vinSids) {
+        return null;
+    }
+
     @Override
     public ResultBean saveArrearsApply(AdvanceArrearsDto dto) {
         return null;

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;
 
 
 }

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<GcCarListVo> gcList;
+}

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;
 
 }

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;
+}

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<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> 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);
     }
 

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<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> rb = ResultBean.fireFail();
@@ -221,4 +226,16 @@ public class AppBusArrearsCarryVehicleApplyService {
     }
 
 
+    public ResultBean<List<ArrearsCarVo>> getCanUseCars(String contractNo, List<String> vinSids) {
+        ResultBean<List<ArrearsCarVo>> rb = ResultBean.fireFail();
+        QCarQuery qCarQuery = new QCarQuery();
+        qCarQuery.setContractNo(contractNo);
+        qCarQuery.setVinSids(vinSids);
+        ResultBean<List<QCarVo>> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        List<ArrearsCarVo> 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);
+    }
 }