虚拟订单订金车辆预定接口，款项确认部分接口修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java

@@ -32,7 +32,7 @@ public class AppBusDepositBusDetailsVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    private String payType;
 
     @ApiModelProperty("付款方式")
     private String payTypeKey;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListDto.java

@@ -23,7 +23,7 @@ public class AppBusDepositVehicleCarListDto implements Dto {
     @ApiModelProperty(value = "存放地点")
     private String location;
     @ApiModelProperty(value = "价格")
-    private BigDecimal pirce;
+    private BigDecimal price;
     @ApiModelProperty(value = "配置sid")
     private String configSid;
     @ApiModelProperty(value = "车型sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListVo.java

@@ -21,7 +21,7 @@ public class AppBusDepositVehicleCarListVo implements Vo {
     @ApiModelProperty(value = "存放地点")
     private String location;
     @ApiModelProperty(value = "价格")
-    private String pirce;
+    private String price;
     @ApiModelProperty(value = "配置sid")
     private String configSid;
     @ApiModelProperty(value = "车型sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java

@@ -15,22 +15,28 @@ public class AppBusDepositVehicleDetailVo implements Vo {
     private String virtualOrderId;
     @ApiModelProperty(value = "制单日期")
     private String virtualOrderDate;
+
     @ApiModelProperty(value = "客户sid")
     private String customerSid;
     @ApiModelProperty(value = "客户名称")
     private String customerName;
     @ApiModelProperty(value = "手机号")
     private String mobile;
-    @ApiModelProperty(value = "微信")
-    private String weiXin;
     @ApiModelProperty(value = "头像")
     private String headImage;
+    @ApiModelProperty("客户类型")
+    private String customerClass;
+    @ApiModelProperty("客户类型key")
+    private String customerClassKey;
     @ApiModelProperty(value = "部门名称")
     private String departmentName;
     @ApiModelProperty(value = "销售专员")
     private String sellerName;
     @ApiModelProperty(value = "更新状态地址")
     private String updateStateUrl;
+    @ApiModelProperty(value = "说明")
+    private String explain;
+
     @ApiModelProperty(value = "车辆信息集合")
     private List<AppBusDepositVehicleListVo> vehicleList;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java

@@ -10,18 +10,34 @@ import java.util.List;
 public class AppBusDepositVehicleDetailsInitVo implements Vo {
 
     private static final long serialVersionUID = 2722924537887809601L;
-    @ApiModelProperty(value = "客户名称")
-    private String cusmoterName;
+
+    @ApiModelProperty(value = "订单sid")
+    private String virtualOrderSid;
     @ApiModelProperty(value = "虚拟订单编号")
     private String virtualOrderId;
+    @ApiModelProperty(value = "虚拟订单创建日期")
+    private String createDate;
+
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
     @ApiModelProperty(value = "销售专员")
     private String sellerName;
     @ApiModelProperty(value = "部门名称")
     private String departmentName;
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-    @ApiModelProperty(value = "虚拟订单创建日期")
-    private String createDate;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+
+    @ApiModelProperty(value = "任务Id")
+    private String taskId;
+    @ApiModelProperty(value = "流程实例ID")
+    private String procInsId;
+
     @ApiModelProperty(value = "车辆list")
     private List<AppBusDepositVehicleCarListVo> carList;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java

@@ -14,7 +14,7 @@ public class AppBusDepositVehicleDto implements Dto {
     @ApiModelProperty("虚拟订单sid")
     private String virtualOrderSid;
     @ApiModelProperty("客户名称")
-    private String cusmoterName;
+    private String customerName;
     @ApiModelProperty("订单编号")
     private String virtualOrderId;
     @ApiModelProperty("业务员名称")
@@ -27,6 +27,10 @@ public class AppBusDepositVehicleDto implements Dto {
     private String createDate;
     @ApiModelProperty("用户sid")
     private String userSid;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
     @ApiModelProperty("车辆信息")
     private List<AppBusDepositVehicleCarListDto> carList;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomer.java

@@ -37,4 +37,13 @@ public class BusDepositVehicleCustomer extends BaseEntity {
     
 	@ApiModelProperty("客户联系电话")
     private String customerMobile;
+
+    @ApiModelProperty("客户类型")
+    private String customerClass;
+
+    @ApiModelProperty("客户类型key")
+    private String customerClassKey;
+
+    @ApiModelProperty("客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomerVo.java

@@ -23,16 +23,25 @@ import lombok.Data;
 @Data
 public class BusDepositVehicleCustomerVo implements Vo {
 
-    
-	@ApiModelProperty("单据sid")
+
+    @ApiModelProperty("单据sid")
     private String billSid;
-    
-	@ApiModelProperty("客户sid")
+
+    @ApiModelProperty("客户sid")
     private String customerSid;
-    
-	@ApiModelProperty("客户名称")
+
+    @ApiModelProperty("客户名称")
     private String customerName;
-    
-	@ApiModelProperty("客户联系电话")
+
+    @ApiModelProperty("客户联系电话")
     private String customerMobile;
+
+    @ApiModelProperty("客户类型")
+    private String customerClass;
+
+    @ApiModelProperty("客户类型key")
+    private String customerClassKey;
+
+    @ApiModelProperty("客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java

@@ -22,8 +22,8 @@ public class AppBusDepositBuscenterDto implements Dto {
     @ApiModelProperty("收款银行账号")
     private String collectionNumber;
 
-    @ApiModelProperty("付款方式value")
-    private String payTypeValue;
+    @ApiModelProperty("付款方式")
+    private String payType;
 
     @ApiModelProperty("付款方式key")
     private String payTypeKey;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositFlowTask.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusMainDepositFlowTask {
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java

@@ -97,4 +97,16 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "是否显示申请收款单 流程状态为 收款确认 时显示")
     private boolean showApplyBtn;
 
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("是否显示下载按钮")
+    private boolean showDonwnLoadBtn;
+
+    @ApiModelProperty("下载地址")
+    private String downLoadUrl;
+
+    @ApiModelProperty("订车特殊：审批成功后不再显示流程状态显示为 ： 有效期：3天/2天/1天;失效")
+    private String virtualOrderState2;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@@ -26,17 +26,20 @@
 package com.yxt.anrui.buscenter.api.busmaindeposit;
 
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -121,16 +124,58 @@ public interface BusMainDepositFeign {
     @PostMapping("/submitMainDespoitVehicleApprove")
     public ResultBean submitMainDespoitVehicleApprove(@RequestBody @Valid BusMainDepositVehicleDto dto);
 
-    /*************************************************APP虚拟订单审批流程***************************************************/
+    /*************************************************APP虚拟订单订金审批流程***************************************************/
 
     @ApiOperation("提交App虚拟订单（订金）审批流程")
     @PostMapping("/submitAppMainDespoitApprove")
     public ResultBean submitAppMainDespoitApprove(@RequestBody @Valid AppBusDepositBuscenterDto dto);
 
+    @ApiOperation("重新提交App虚拟订单（订金）审批流程")
+    @PutMapping("/reSubmitAppMainDespoitApprove")
+    public ResultBean reSubmitAppMainDespoitApprove(@RequestBody @Valid AppBusDepositBuscenterDto dto);
+
+    @ApiOperation("同意办理")
+    @PutMapping("/agreeDeposit")
+    public ResultBean agreeDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation("撤回流程")
+    @PutMapping("/recallDeposit")
+    public ResultBean recallDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/rejectDeposit")
+    public ResultBean rejectDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "终止任务")
+    @PutMapping(value = "/stopDeposit")
+    public ResultBean stopDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    /*************************************************APP虚拟订单预定车辆审批流程***************************************************/
+
     @ApiOperation("提交App虚拟订单（预定车辆）审批流程")
     @PostMapping("/submitAppMainDespoitVehicleApprove")
     public ResultBean submitAppMainDespoitVehicleApprove(@RequestBody @Valid AppBusDepositVehicleDto dto);
 
+    @ApiOperation("重新提交App虚拟订单（预定车辆）审批流程")
+    @PostMapping("/reSubmitAppMainDespoitVehicleApprove")
+    public ResultBean reSubmitAppMainDespoitVehicleApprove(@RequestBody @Valid AppBusDepositVehicleDto dto);
+
+    @ApiOperation("同意办理")
+    @PutMapping("/agreeReserveCar")
+    public ResultBean agreeReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation("撤回流程")
+    @PutMapping("/recallReserveCar")
+    public ResultBean recallReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/rejectReserveCar")
+    public ResultBean rejectReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "终止任务")
+    @PutMapping(value = "/stopReserveCar")
+    public ResultBean stopReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
     /************************************************************************************/
 
     @ApiOperation("虚拟订单列表（新）")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java

@@ -26,12 +26,16 @@
 package com.yxt.anrui.buscenter.api.busmaindeposit;
 
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -49,116 +53,166 @@ import java.util.List;
 @Component
 public class BusMainDepositFeignFallback implements BusMainDepositFeign {
 
-	@Override
-	public ResultBean<PagerVo<BusMainDepositListVo>> listPage(PagerQuery<BusMainDepositQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/listPage无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<BusMainDepositListVo>> listPage(PagerQuery<BusMainDepositQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/listPage无法访问");
+    }
 
     @Override
-    public ResultBean<List<BusMainDepositVo>> listAll(BusMainDepositQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/listAll无法访问");
-	}
+    public ResultBean<List<BusMainDepositVo>> listAll(BusMainDepositQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/listAll无法访问");
+    }
 
-	@Override
-	public ResultBean saveOrUpdateDeposit(BusDepositDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问");
-	}
+    @Override
+    public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问");
+    }
 
-	@Override
-	public ResultBean saveDepositVehicle(BusMainDepositVehicleDto dto) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问");
-	}
+    @Override
+    public ResultBean saveDepositVehicle(BusMainDepositVehicleDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问");
+    }
 
 	/*@Override
 	public ResultBean updateDeposit(BusDepositDto dto, String sid){
 		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问");
 	}*/
 
-	@Override
-	public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDepositVehicle无法访问");
-	}
-
-	@Override
-	public ResultBean deleteBySids(String [] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySids无法访问");
-	}
-
-	@Override
-	public ResultBean deleteBySidAndCustomerSid(String sid, String customerSid) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySidAndCustomerSid无法访问");
-	}
-
-	@Override
-	public ResultBean deleteBySidAndVehicleSid(String sid, String vehicleSid) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySidAndVehicleSid无法访问");
-	}
-
-	@Override
-	public ResultBean<BusMainDepositVo> fetchBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/fetchBySid无法访问");
-	}
-
-	@Override
-	public ResultBean initBusMainDeposit(BusMainDepositDetailQuery query) {
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/initBusMainDeposit无法访问");
-	}
-
-	@Override
-	public ResultBean selectDepositBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositBySid无法访问");
-	}
-
-	@Override
-	public ResultBean selectDepositVehBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositVehBySid无法访问");
-	}
-
-	@Override
-	public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitApprove无法访问");
-	}
-
-	@Override
-	public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitVehicleApprove无法访问");
-	}
-
-	@Override
-	public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(PagerQuery<AppBusMainDepositQuery> pagerQuery) {
-		return null;
-	}
-
-	@Override
-	public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean reserveCarInfo(AppBusDepositVehicleDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean deleteVirtualOrder(String userSid, String virtualOrderSid) {
-		return null;
-	}
+    @Override
+    public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDepositVehicle无法访问");
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySids无法访问");
+    }
+
+    @Override
+    public ResultBean deleteBySidAndCustomerSid(String sid, String customerSid) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySidAndCustomerSid无法访问");
+    }
+
+    @Override
+    public ResultBean deleteBySidAndVehicleSid(String sid, String vehicleSid) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/deleteBySidAndVehicleSid无法访问");
+    }
+
+    @Override
+    public ResultBean<BusMainDepositVo> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/fetchBySid无法访问");
+    }
+
+    @Override
+    public ResultBean initBusMainDeposit(BusMainDepositDetailQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/initBusMainDeposit无法访问");
+    }
+
+    @Override
+    public ResultBean selectDepositBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositBySid无法访问");
+    }
+
+    @Override
+    public ResultBean selectDepositVehBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositVehBySid无法访问");
+    }
+
+    @Override
+    public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitApprove无法访问");
+    }
+
+    @Override
+    public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitVehicleApprove无法访问");
+    }
+
+    @Override
+    public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(PagerQuery<AppBusMainDepositQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reserveCarInfo(AppBusDepositVehicleDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteVirtualOrder(String userSid, String virtualOrderSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -34,7 +34,7 @@
                vehicleNum   AS carNumber,
                deposit      AS deposit,
                paymentDate  AS payDate,
-               payType      AS payTypeValue,
+               payType,
                payTypeKey,
                proBankAcc   AS collectionNumber,
                paymentProof,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -131,7 +131,7 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
             vo.setCustomerList(new ArrayList<>());
         }
         vo.setCustomerList(customerList);
-        send(vo.getPayName());
+//        send(vo.getPayName());
         return vo;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml

@@ -38,12 +38,11 @@
                bdv.remarks,
                bdv.reserve_deposit_date                                                        AS depositDate,
                bdv.reserve_position                                                            AS location,
-               bdv.reserve_price                                                               AS pirce,
+               bdv.reserve_price                                                               AS price,
                bdv.modelSid,
                bdv.modelConfigSid                                                              AS configSid,
                bdv.vehicleSid                                                                  AS carSid,
-               (SELECT bv.vinNo FROM anrui_base.base_vehicle bv where bv.sid = bdv.vehicleSid) as vin,
-               bdv.customerSid
+               (SELECT bv.vinNo FROM anrui_base.base_vehicle bv where bv.sid = bdv.vehicleSid) as vin
         FROM bus_deposit_vehicle bdv
         WHERE bdv.billSid = #{virtualOrderSid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java

@@ -19,6 +19,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -205,18 +206,21 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             vo.setCreateDate(simpleDateFormat.format(new Date()));
             vo.setCarList(new ArrayList<>());
+            vo.setUserSid(query.getUserSid());
             return new ResultBean<AppBusDepositVehicleDetailsInitVo>().success().setData(vo);
         } else {
             AppBusDepositVehicleDetailsInitVo vo = new AppBusDepositVehicleDetailsInitVo();
             String virtualOrderSid = query.getVirtualOrderSid();
-            BusMainDeposit busMainDeposit = busMainDepositService.fetchBySid(virtualOrderSid);
-            BusDepositVehicleCustomerVo customerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
-            vo.setCusmoterName(customerVo.getCustomerName());
-            vo.setMobile(customerVo.getCustomerMobile());
-            vo.setDepartmentName(busMainDeposit.getOrgName());
-            vo.setSellerName(busMainDeposit.getStaffName());
+            BusMainDeposit busMainDeposit = busMainDepositService.selBusMainDepositBySid(virtualOrderSid);
             vo.setVirtualOrderId(busMainDeposit.getBillNo());
             vo.setCreateDate(busMainDeposit.getCreateDate());
+            BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
+            vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+            vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            vo.setSellerName(busMainDeposit.getStaffName());
+            vo.setDepartmentName(busMainDeposit.getOrgName());
+            vo.setVirtualOrderSid(query.getVirtualOrderSid());
+            vo.setUserSid(query.getUserSid());
             List<AppBusDepositVehicleCarListVo> carList = baseMapper.selByBillSidList(virtualOrderSid);
             if (carList.size() > 0) {
                 vo.setCarList(carList);
@@ -238,7 +242,7 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         ResultBean<AppCrmCustomerTempInfoVo> tempDetailsBySid = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(query.getCustomerSid());
         AppUserOrgInfoVo sysUserData = sysUserFeign.getUserOrgInfoByUserSid(query.getUserSid()).getData();
         AppCrmCustomerTempInfoVo data = tempDetailsBySid.getData();
-        vo.setCusmoterName(data.getName());//客户名称
+        vo.setCustomerName(data.getName());//客户名称
         vo.setMobile(data.getMobile());//手机号
         vo.setSellerName(sysUserData.getStaffName());//销售专员
         vo.setDepartmentName(sysUserData.getOrgName());//部门名称
@@ -253,27 +257,24 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
      */
     public ResultBean<AppBusDepositVehicleDetailVo> getReserveCarDetails(String virtualOrderSid) {
         AppBusDepositVehicleDetailVo vo = new AppBusDepositVehicleDetailVo();
-        vo.setUpdateStateUrl("buscenter/v1/busmaindeposit/updateBusDepositMainNodeState");
-        BusMainDeposit busMainDeposit = busMainDepositService.fetchBySid(virtualOrderSid);
+        //查询单据信息
+        BusMainDeposit busMainDeposit = busMainDepositService.selBusMainDepositBySid(virtualOrderSid);
         vo.setVirtualOrderId(busMainDeposit.getBillNo());
         vo.setVirtualOrderDate(busMainDeposit.getCreateDate());
-        //然后获取车辆信息的list
-        List<AppBusDepositVehicleCarListVo> appBusDepositVehicleCarListVos = baseMapper.selByBillSidList(virtualOrderSid);
-        AppBusDepositVehicleCarListVo appBusDepositVehicleCarListVo = appBusDepositVehicleCarListVos.get(0);
-        String customerSid = appBusDepositVehicleCarListVo.getCustomerSid();
-        ResultBean<AppCrmCustomerTempInfoVo> CustomerTempDetails = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid);
-        vo.setMobile(CustomerTempDetails.getData().getMobile());
-//        vo.setWeiXin(CustomerTempDetails.getData().getWeixin());
-//        vo.setHeadImage(CustomerTempDetails.getData().getCustomerPhoto());
-        vo.setCustomerName(CustomerTempDetails.getData().getName());
-        vo.setCustomerSid(CustomerTempDetails.getData().getSid());
-        String staffSid = CustomerTempDetails.getData().getStaffSid();
-        SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
-        vo.setDepartmentName(data.getOrgName());
-        vo.setSellerName(data.getName());
-        List<AppBusDepositVehicleListVo> vehicleList = baseMapper.selVehicleListByBillSid(virtualOrderSid);
-        vo.setVehicleList(vehicleList);
-        //然后返回数据
+        //查询客户信息
+        BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
+        vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
+        vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+        vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+        vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
+        vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
+        vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
+        vo.setSellerName(busMainDeposit.getStaffName());
+        vo.setDepartmentName(busMainDeposit.getOrgName());
+        vo.setUpdateStateUrl("未确定字段");
+        //查询车辆信息
+        List<AppBusDepositVehicleListVo> appBusDepositVehicleListVos = baseMapper.selVehicleListByBillSid(virtualOrderSid);
+        vo.setVehicleList(appBusDepositVehicleListVos);
         return new ResultBean<AppBusDepositVehicleDetailVo>().success().setData(vo);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -88,4 +89,8 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      */
     void modifiBusDepositFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
                                    @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
+
+    BusMainDeposit selBusMainDepositBySid(@Param("virtualOrderSid") String virtualOrderSid);
+
+    int updateFlowFiled(Map<String, Object> map);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -27,7 +27,7 @@
         SELECT bmd.sid AS virtualOrderSid,
         bmd.billNo AS virtualOrderId,
         bmd.createDate AS virtualOrderDate,
-        bmd.depositBillType AS virtualOrderType,
+        bmd.depositBillTypeKey AS virtualOrderType,
         bmd.staffName AS sellerName,
         bmd.remarks,
         bd.vehicleNum AS carNumber,
@@ -107,6 +107,11 @@
         FROM bus_main_deposit bmd
         WHERE bmd.sid = #{virtualOrderSid}
     </select>
+    <select id="selBusMainDepositBySid" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit">
+        SELECT *
+        FROM bus_main_deposit
+        WHERE sid = #{virtualOrderSid}
+    </select>
     <update id="modifiBusDepositFlowState">
         update bus_main_deposit
         set procDefId=#{procDefId},
@@ -115,4 +120,16 @@
             nodeSid=#{nodeSid}
         where sid = #{businessSid}
     </update>
+
+    <update id="updateFlowFiled" parameterType="java.util.Map">
+        UPDATE bus_main_deposit
+        SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInsId=#{procInsId}
+        </if>
+        WHERE sid=#{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -159,18 +161,141 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return busMainDepositService.submitMainDespoitVehicleApprove(dto);
     }
 
-    /*************************************************APP虚拟订单审批流程***************************************************/
+    /*************************************************APP虚拟订单订金审批流程***************************************************/
 
+    /**
+     * 提交流程
+     *
+     * @param dto
+     * @return
+     */
     @Override
     public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
         return busMainDepositService.submitAppMainDespoitApprove(dto);
     }
 
+    /**
+     * 重新提交流程
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        return busMainDepositService.reSubmitAppMainDespoitApprove(dto);
+    }
+
+    /**
+     * 同意
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.agreeDeposit(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 撤回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.recallDeposit(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 驳回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.rejectDeposit(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 驳回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.stopDeposit(appBusMainDepositFlowTask);
+    }
+
+    /*************************************************APP虚拟订单预定车辆审批流程***************************************************/
+    /**
+     * 提交审批
+     *
+     * @param dto
+     * @return
+     */
     @Override
     public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
         return busMainDepositService.submitAppMainDespoitVehicleApprove(dto);
     }
 
+    /**
+     * 从新提交审批
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
+        return busMainDepositService.reSubmitAppMainDespoitVehicleApprove(dto);
+    }
+
+    /**
+     * 同意
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.agreeReserveCar(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 终止
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.recallReserveCar(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 驳回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.rejectReserveCar(appBusMainDepositFlowTask);
+    }
+
+    /**
+     * 撤回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    @Override
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return busMainDepositService.stopReserveCar(appBusMainDepositFlowTask);
+    }
+    /****************************************************************************************************/
     /**
      * 虚拟订单列表（新）
      *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -40,13 +40,20 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicle;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
 import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService;
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
+import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -61,6 +68,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -109,6 +117,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     private BusDepositCustomerService busDepositCustomerService;
 
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
 
@@ -580,6 +592,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 if (flowState == 0 || flowState == -1) {
                     record.setShowUpdateBtn(true);
                     record.setShowDeleteBtn(true);
+                    record.setShowDonwnLoadBtn(true);
                 }
             } else {
                 record.setShowUpdateBtn(true);
@@ -647,7 +660,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
             busDepositService.insert(busDeposit);
             //添加客户信息
-            appSetBusDepositCustomer(dto, busDeposit);
+            appSetBusDepositCustomer(dto, busDeposit.getBillSid());
             return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功");
         } else { //修改
             Integer flowState = sysFormLinkFeign.selectStateByBusinessSid(dto.getVirtualOrderSid()).getData().getFlowState();
@@ -659,7 +672,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 setBusDeposit(busDeposit, dto);
                 busDepositService.updateById(busDeposit);
                 busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
-                appSetBusDepositCustomer(dto, busDeposit);
+                appSetBusDepositCustomer(dto, busDeposit.getBillSid());
                 return new ResultBean().success().setMsg("修改成功");
             }
             return new ResultBean().fail().setMsg("已提交办理审批中不可修改!");
@@ -677,7 +690,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDeposit.setDraweeName(dto.getPayName());
         busDeposit.setProBankAcc(dto.getCollectionNumber());
         busDeposit.setPayTypeKey(dto.getPayTypeKey());
-        busDeposit.setPayType(dto.getPayTypeValue());
+        busDeposit.setPayType(dto.getPayType());
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
         busDeposit.setDraweeMobile(dto.getMobile());
@@ -690,16 +703,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * 新增/修改虚拟订单订金收取添加客户信息方法
      *
      * @param dto
-     * @param busDeposit
+     * @param billSid
      */
-    public void appSetBusDepositCustomer(AppBusDepositBuscenterDto dto, BusDeposit busDeposit) {
+    public void appSetBusDepositCustomer(AppBusDepositBuscenterDto dto, String billSid) {
         for (AppBusDepositCustomerListDto appBusDepositCustomerListDto : dto.getCustomerList()) {
             BusDepositCustomer busDepositCustomer = new BusDepositCustomer();
             busDepositCustomer.setSid(UUID.randomUUID().toString());
             busDepositCustomer.setCustomerSid(appBusDepositCustomerListDto.getCustomerSid());
             busDepositCustomer.setCustomerMobile(appBusDepositCustomerListDto.getMobile());
             busDepositCustomer.setCustomerName(appBusDepositCustomerListDto.getCustomerName());
-            busDepositCustomer.setBillSid(busDeposit.getBillSid());
+            busDepositCustomer.setBillSid(billSid);
             busDepositCustomerService.insert(busDepositCustomer);
         }
     }
@@ -919,6 +932,63 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return new ResultBean().success();
     }
 
+    /**
+     * APP重新提交虚拟订单审批（订金）流程
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+
+        String businessSid = "";
+        if (StringUtils.isBlank(dto.getUserSid())) {
+            return new ResultBean().fail().setMsg("用户sid不能为空");
+        }
+        // 验证
+        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
+            // 调用保存/修改接口
+            ResultBean resultBean = saveDepositInfo(dto);
+            if (!resultBean.getSuccess()) {
+                return resultBean.setMsg("提交失败");
+            }
+            businessSid = resultBean.getData().toString();
+        } else {
+            businessSid = dto.getVirtualOrderSid();
+        }
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskId", dto.getTaskId());
+        variables.put("procInsId", dto.getProcInsId());
+        variables.put("businessSid", businessSid);
+        variables.put("userSid", dto.getUserSid());
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setDetailUrl("");
+        bv.setHandleUrl("");
+        bv.setFormVariables(variables);
+        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = "";
+        String taskDefKey = "";
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", variables.get("businessSid").toString());
+        if (resultBean.getData() != null) {
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
+            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+                nodeState = listResultBean.getData().get(0).getName_();
+                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+            } else {
+                nodeState = ProcessStateEnum.FINISHED.getStateName();
+                taskDefKey = "Event_end";
+                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+            }
+        }
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
     /**
      * APP提交虚拟订单审批（预定车辆）流程
      *
@@ -978,9 +1048,14 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             baseMapper.insert(busMainDeposit);
             // 车辆客户信息
             BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer();
-            customer.setCustomerSid(dto.getCustomerSid());
-            customer.setCustomerName(dto.getCusmoterName());
-            customer.setCustomerMobile(dto.getMobile());
+            String customerSid = dto.getCustomerSid();
+            AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid).getData();
+            customer.setCustomerSid(customerSid);
+            customer.setCustomerName(appCrmCustomerTempInfoVo.getName());
+            customer.setCustomerMobile(appCrmCustomerTempInfoVo.getMobile());
+            customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType());
+            customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey());
+            customer.setCustomerPhoto(appCrmCustomerTempInfoVo.getCustomerPhoto());
             customer.setSid(UUID.randomUUID().toString());
             customer.setBillSid(busMainDeposit.getSid());
             busDepositVehicleCustomerService.save(customer);
@@ -1010,11 +1085,357 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busDepositVehicle.setRemarks(carListDto.getRemarks());
             busDepositVehicle.setReserve_deposit_date(carListDto.getDepositDate());
             busDepositVehicle.setReserve_position(carListDto.getLocation());
-            busDepositVehicle.setReserve_price(carListDto.getPirce());
+            busDepositVehicle.setReserve_price(carListDto.getPrice());
             busDepositVehicle.setModelConfigSid(carListDto.getConfigSid());
             busDepositVehicle.setModelSid(carListDto.getModelSid());
             busDepositVehicle.setVehicleSid(carListDto.getCarSid());
             busDepositVehicleService.insert(busDepositVehicle);
         }
     }
+
+    public BusMainDeposit selBusMainDepositBySid(String virtualOrderSid) {
+        return baseMapper.selBusMainDepositBySid(virtualOrderSid);
+    }
+
+    /**
+     * 订金办理同意
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskId", appBusMainDepositFlowTask.getTaskId());
+        variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId());
+        variables.put("comment", appBusMainDepositFlowTask.getComment());
+        variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid());
+        variables.put("userSid", appBusMainDepositFlowTask.getUserSid());
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setDetailUrl("");
+        bv.setHandleUrl("");
+        bv.setFormVariables(variables);
+        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = "";
+        String taskDefKey = "";
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", variables.get("businessSid").toString());
+        if (resultBean.getData() != null) {
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
+            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+                nodeState = listResultBean.getData().get(0).getName_();
+                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+            } else {
+                nodeState = ProcessStateEnum.FINISHED.getStateName();
+                taskDefKey = "Event_end";
+                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+            }
+        }
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
+    /**
+     * 订金撤回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = resultBean.getData().get(0).getName_();
+        String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+        String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        if (incomingSourceRef.contains("start")) {
+            paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
+            paramMap.put("taskDefKey", taskDefKey);
+            paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
+        } else {
+            paramMap.put("nodeState", nodeState);
+            paramMap.put("taskDefKey", taskDefKey);
+        }
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
+    /**
+     * 订金驳回
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = resultBean.getData().get(0).getName_();
+        String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+        String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        if (incomingSourceRef.contains("start")) {
+            paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
+        }
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
+    /**
+     * 订金终止流程
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean resultBean = flowTaskFeign.breakProcess(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        paramMap.put("nodeState", String.valueOf(resultBean.getData()));
+        paramMap.put("taskDefKey", "Event_end");
+        paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
+    /**
+     * 更新流程相关的状态
+     *
+     * @param map
+     * @return
+     */
+    private int updateFlowFiled(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
+
+    public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
+        String businessSid = "";
+        if (StringUtils.isBlank(dto.getUserSid())) {
+            return new ResultBean().fail().setMsg("用户sid");
+        }
+        // 验证
+        if (StringUtils.isBlank(dto.getVirtualOrderSid())) {
+            // 调用保存/修改接口
+            ResultBean resultBean = reserveCarInfo(dto);
+            if (!resultBean.getSuccess()) {
+                return resultBean.setMsg("提交失败");
+            }
+            businessSid = resultBean.getData().toString();
+        } else {
+            businessSid = dto.getVirtualOrderSid();
+        }
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskId", dto.getTaskId());
+        variables.put("procInsId", dto.getProcInsId());
+        variables.put("businessSid", businessSid);
+        variables.put("userSid", dto.getUserSid());
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setDetailUrl("");
+        bv.setHandleUrl("");
+        bv.setFormVariables(variables);
+        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = "";
+        String taskDefKey = "";
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", variables.get("businessSid").toString());
+        if (resultBean.getData() != null) {
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
+            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+                nodeState = listResultBean.getData().get(0).getName_();
+                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+            } else {
+                nodeState = ProcessStateEnum.FINISHED.getStateName();
+                taskDefKey = "Event_end";
+                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+            }
+        }
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        updateFlowFiled(paramMap);
+        return resultBean;
+    }
+
+    /**
+     * 预定车辆同意办理
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("taskId", appBusMainDepositFlowTask.getTaskId());
+        variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId());
+        variables.put("comment", appBusMainDepositFlowTask.getComment());
+        variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid());
+        variables.put("userSid", appBusMainDepositFlowTask.getUserSid());
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setDetailUrl("");
+        bv.setHandleUrl("");
+        bv.setFormVariables(variables);
+        ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = "";
+        String taskDefKey = "";
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", variables.get("businessSid").toString());
+        if (resultBean.getData() != null) {
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
+            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+                nodeState = listResultBean.getData().get(0).getName_();
+                taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
+            } else {
+                nodeState = ProcessStateEnum.FINISHED.getStateName();
+                taskDefKey = "Event_end";
+                paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+            }
+        }
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        updateFlowFiled(paramMap);
+        return resultBean;
+
+    }
+
+    /**
+     * 预定车辆撤回流程
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.revokeProcess(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = resultBean.getData().get(0).getName_();
+        String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+        String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        if (incomingSourceRef.contains("start")) {
+            paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
+            paramMap.put("taskDefKey", taskDefKey);
+            paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
+        } else {
+            paramMap.put("nodeState", nodeState);
+            paramMap.put("taskDefKey", taskDefKey);
+        }
+        updateFlowFiled(paramMap);
+        return resultBean;
+
+    }
+
+    /**
+     * 预定车辆驳回任务
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.taskReject(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        String nodeState = resultBean.getData().get(0).getName_();
+        String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+        String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        paramMap.put("nodeState", nodeState);
+        paramMap.put("taskDefKey", taskDefKey);
+        if (incomingSourceRef.contains("start")) {
+            paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
+        }
+        updateFlowFiled(paramMap);
+        return resultBean;
+
+    }
+
+    /**
+     * 预定车辆终止任务
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+
+        com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+        String userSid = appBusMainDepositFlowTask.getUserSid();
+        String businessSid = appBusMainDepositFlowTask.getBusinessSid();
+        fl.setTaskId(appBusMainDepositFlowTask.getTaskId());
+        fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId());
+        fl.setComment(appBusMainDepositFlowTask.getComment());
+        fl.setUserSid(userSid);
+        ResultBean resultBean = flowTaskFeign.breakProcess(fl);
+        if (!resultBean.getSuccess()) {
+            return resultBean;
+        }
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sid", businessSid);
+        paramMap.put("nodeState", String.valueOf(resultBean.getData()));
+        paramMap.put("taskDefKey", "Event_end");
+        paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
+        updateFlowFiled(paramMap);
+        return resultBean;
+
+    }
+
+
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java

@@ -74,5 +74,8 @@ public class AppCrmCustomerTempInfoVo implements Vo {
     @ApiModelProperty("客户级别")
     private String level;
 
+    @ApiModelProperty("客户头像")
+    private String customerPhoto;
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -187,7 +187,8 @@
                cct.certificateType            AS idType,
                cct.sex,
                cct.birthday,
-               cct.`level`
+               cct.`level`,
+               cct.customerPhoto
         FROM crm_customer_temp cct
         WHERE cct.sid = #{sid}
     </select>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java

@@ -18,4 +18,8 @@ public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query {
     @ApiModelProperty("明细sid")
     private List<String> sidList;
 
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -102,5 +103,5 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")
-    public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -104,7 +105,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+	public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
 		return null;
 	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppFinUncollectedReceivablesDetailedVo implements Vo {
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("客户名称")
+    private String name;
+
+    @ApiModelProperty("应收金额")
+    private String receivable;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+
+    @ApiModelProperty("认款金额")
+    private String confirmMoney;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("认款时间")
+    private String confirmDate;
+
+    @ApiModelProperty("认款状态")
+    private String state;
+
+}

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -163,10 +164,10 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
      * @return
      */
     @Override
-    public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
-        PagerVo<AppFinSelectedReceivablesPaymentDetailsVo> page = new PagerVo<>();
-        IPage<AppFinSelectedReceivablesPaymentDetailsVo> iPage = finCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
-        PagerVo<AppFinSelectedReceivablesPaymentDetailsVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>>().success().setData(pagerVo);
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+        PagerVo<AppFinUncollectedReceivablesDetailedVo> page = new PagerVo<>();
+        IPage<AppFinUncollectedReceivablesDetailedVo> iPage = finCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
+        PagerVo<AppFinUncollectedReceivablesDetailedVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>>().success().setData(pagerVo);
     }
 }

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

@@ -37,6 +37,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceiv
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
@@ -57,8 +58,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -534,11 +539,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      * @param pagerQuery
      * @return
      */
-    public IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        if (StringUtils.isNotBlank(useOrgSid)) {
+            pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        }
         IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
+        QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
         List<String> sidList = pagerQuery.getParams().getSidList();
-        IPage<AppFinSelectedReceivablesPaymentDetailsVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
+        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
+        List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
+        for (AppFinUncollectedReceivablesDetailedVo record : records) {
+            record.setReceivable(record.getConfirmMoney());
+            record.setConfirmDate(dateFormat.format(new Date()));
+        }
         return collectionConfirmList;
     }
 
@@ -548,11 +563,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      * @param pagerQuery 查询条件
      * @return
      */
-    private QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) {
-        QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>();
+    private QueryWrapper<AppFinUncollectedReceivablesDetailedVo> appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) {
+        QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
-            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
-                qw.like("bv.vinNo", pagerQuery.getName());
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {
+                qw.like("furd.name", pagerQuery.getName());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {
+                qw.eq("furd.useOrgSid", pagerQuery.getUseOrgSid());
             }
         }
         return qw;
@@ -600,23 +618,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             String sid2 = finUncollectedReceivablesDetailedVo.getSid();
             BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
             BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
-            if (subtract.compareTo(BigDecimal.ZERO) == 0){
+            if (subtract.compareTo(BigDecimal.ZERO) == 0) {
                 int subscriptionState = 3;
-                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2,subscriptionState);
-            }else {
+                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
+            } else {
                 int subscriptionState = 2;
-                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2,subscriptionState);
+                finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
             }
         }
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
         BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney);
-        if (subtract.compareTo(BigDecimal.ZERO) == 0){
+        if (subtract.compareTo(BigDecimal.ZERO) == 0) {
             int paymentState = 3;
-            baseMapper.updatePaymentStateBySid(sid,paymentState);
-        }else {
+            baseMapper.updatePaymentStateBySid(sid, paymentState);
+        } else {
             int paymentState = 2;
-            baseMapper.updatePaymentStateBySid(sid,paymentState);
+            baseMapper.updatePaymentStateBySid(sid, paymentState);
         }
         return rb.success().setMsg("款项确认成功");
     }

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -78,7 +79,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
      * @param qw
      * @return
      */
-    IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw);
+    IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
 
 
     @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")

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

@@ -21,29 +21,18 @@
 
     <!--手机端—查询可使用款项明细列表-->
     <select id="getPaymentDetailsList"
-            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
         SELECT
-        <!--合同编号-->
-        -- AS contractId,
-        <!--项目名称-->
-        -- AS projectName,
-        <!--联系电话-->
-        -- AS mobile,
-        <!--客户名称-->
-        -- AS `name`,
-        <!--应收金额-->
-        -- AS receivable,
-        <!--合同sid-->
-        -- AS contractSid,
-        <!--付款金额-->
-        -- AS confirmMoney,
-        <!--车架号-->
-        -- VIN AS vin,
-        <!--认款时间-->
-        -- subscriptionDate AS confirmDate,
-        <!--认款状态-->
-        -- AS `state`
-        FROM fin_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN
+        contractNo AS contractId,
+        receivablesName AS projectName,
+        customerPhone AS mobile,
+        customerName AS `name`,
+        currentReceivableMoney AS receivable,
+        contractSid AS contractSid,
+        currentReceivableMoney AS confirmMoney,
+        VIN AS vin
+        FROM
+        fin_uncollected_receivables_detailed furd WHERE furd.sid NOT IN
         <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
             #{sids}
         </foreach>
@@ -60,13 +49,11 @@
 
     <select id="selectDetailedGroupConAndRecAndPay"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
-        SELECT
-                receivablesName,
-                subscriptionMoney,
-                auditDate,
-                remarks
-        FROM
-                fin_selected_receivables_detailed fsrd
+        SELECT receivablesName,
+               subscriptionMoney,
+               auditDate,
+               remarks
+        FROM fin_selected_receivables_detailed fsrd
         WHERE auditState = 3
         GROUP BY contractNo,
                  receivablesName

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -178,7 +179,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
      * @param qw
      * @return
      */
-    public IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw) {
+    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
         return baseMapper.getPaymentDetailsList(sidList, page, qw);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeign.java

@@ -8,17 +8,21 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetails
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailsInitVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
+import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -49,16 +53,54 @@ public interface AppBusMainDepositFeign {
     @DeleteMapping("/deleteVirtualOrder/{virtualOrderSid}/{userSid}")
     public ResultBean deleteVirtualOrder(@PathVariable("userSid") String userSid, @PathVariable("virtualOrderSid") String virtualOrderSid);
 
-    /************************************** 审批流程 ********************************************/
+    /************************************** 订金审批流程 ********************************************/
 
     @ApiOperation("提交App虚拟订单（订金）审批流程")
     @PostMapping("/submitAppMainDespoitApprove")
     public ResultBean submitAppMainDespoitApprove(@RequestBody @Valid AppBusDepositBuscenterDto dto);
 
+    @ApiOperation("重新提交App虚拟订单（订金）审批流程")
+    @PutMapping("/reSubmitAppMainDespoitApprove")
+    public ResultBean reSubmitAppMainDespoitApprove(@RequestBody @Valid AppBusDepositBuscenterDto dto);
+
+    @ApiOperation("同意办理")
+    @PutMapping("/agreeDeposit")
+    public ResultBean agreeDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation("撤回流程")
+    @PutMapping("/recallDeposit")
+    public ResultBean recallDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/rejectDeposit")
+    public ResultBean rejectDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "终止任务")
+    @PutMapping(value = "/stopDeposit")
+    public ResultBean stopDeposit(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    /************************************** 预定车辆审批流程 ********************************************/
+
     @ApiOperation("提交App虚拟订单（预定车辆）审批流程")
     @PostMapping("/submitAppMainDespoitVehicleApprove")
     public ResultBean submitAppMainDespoitVehicleApprove(@RequestBody @Valid AppBusDepositVehicleDto dto);
 
+    @ApiOperation("同意办理")
+    @PutMapping("/agreeReserveCar")
+    public ResultBean agreeReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation("撤回流程")
+    @PutMapping("/recallReserveCar")
+    public ResultBean recallReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/rejectReserveCar")
+    public ResultBean rejectReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
+    @ApiOperation(value = "终止任务")
+    @PutMapping(value = "/stopReserveCar")
+    public ResultBean stopReserveCar(@RequestBody @Valid AppBusMainDepositFlowTask appBusMainDepositFlowTask);
+
 
     /************************************** 订金收取 ********************************************/
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeignFallback.java

@@ -33,13 +33,16 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetails
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailsInitVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
+import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -73,11 +76,56 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign {
         return null;
     }
 
+    @Override
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
     @Override
     public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
         return null;
     }
 
+    @Override
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppBusDepositBuscenterDetailVo> getDepositInfoDetails(String virtualOrderSid) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.finance;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -51,7 +52,7 @@ import org.springframework.web.bind.annotation.*;
 @FeignClient(
         contextId = "anrui-fin-FinCollectionConfirmation",
         name = "anrui-fin",
-        path = "v1/collectionConfirm",
+        path = "finance/v1/collectionConfirm",
         fallback = AppFinCollectionConfirmationFeignFallback.class)
 public interface AppFinCollectionConfirmationFeign {
 
@@ -77,5 +78,5 @@ public interface AppFinCollectionConfirmationFeign {
 
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")
-    public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.finance;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -74,7 +75,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+	public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
 		return null;
 	}
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication(scanBasePackages = {
         "com.yxt.anrui.terminal"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.fin"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositRest.java

@@ -34,7 +34,9 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetails
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailsInitVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
+import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
 import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositFeign;
 import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositPageQuery;
 import com.yxt.common.core.query.PagerQuery;
@@ -46,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>
@@ -85,11 +88,58 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign {
         return appBusMainDepositService.submitAppMainDespoitApprove(dto);
     }
 
+    @Override
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        return appBusMainDepositService.reSubmitAppMainDespoitApprove(dto);
+    }
+
+    @Override
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.agreeDeposit(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.recallDeposit(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.rejectDeposit(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.stopDeposit(appBusMainDepositFlowTask);
+    }
+
+    /*************************************************虚拟订单订车审批流程***************************************************/
     @Override
     public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
         return appBusMainDepositService.submitAppMainDespoitVehicleApprove(dto);
     }
 
+    @Override
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.agreeReserveCar(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.recallReserveCar(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.rejectReserveCar(appBusMainDepositFlowTask);
+    }
+
+    @Override
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        return appBusMainDepositService.stopReserveCar(appBusMainDepositFlowTask);
+    }
+
+    /****************************************************************************************************/
     @Override
     public ResultBean saveDepositInfo(AppBusDepositBuscenterDto appBusDepositBuscenterDto) {
         return appBusMainDepositService.saveDepositInfo(appBusDepositBuscenterDto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositService.java

@@ -30,10 +30,8 @@ import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.buscenter.api.busdeposit.*;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
+import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
-import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositQuery;
-import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
-import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositPageQuery;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -175,13 +173,101 @@ public class AppBusMainDepositService {
         return vins;
     }
 
+    /**
+     * 提交App虚拟订单（订金）审批流程
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
         ResultBean resultBean = busMainDepositFeign.submitAppMainDespoitApprove(dto);
         return resultBean;
     }
 
+    /**
+     * 重新提交App虚拟订单（订金）审批流程
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) {
+        ResultBean resultBean = busMainDepositFeign.reSubmitAppMainDespoitApprove(dto);
+        return resultBean;
+    }
+
+    /**
+     * 同意办理
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.agreeDeposit(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    /**
+     * 撤回流程
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.recallDeposit(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    /**
+     * 驳回任务
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.rejectDeposit(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    /**
+     * 终止任务
+     *
+     * @param appBusMainDepositFlowTask
+     * @return
+     */
+    public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.stopDeposit(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    /**
+     * 提交App虚拟订单（预定车辆）审批流程
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) {
         ResultBean resultBean = busMainDepositFeign.submitAppMainDespoitVehicleApprove(dto);
         return resultBean;
     }
+
+
+    public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.agreeReserveCar(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.recallReserveCar(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.rejectReserveCar(appBusMainDepositFlowTask);
+        return resultBean;
+    }
+
+    public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) {
+        ResultBean resultBean = busMainDepositFeign.stopReserveCar(appBusMainDepositFlowTask);
+        return resultBean;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.finance;
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.terminal.api.finance.AppFinCollectionConfirmationFeign;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -48,8 +49,8 @@ import org.springframework.web.bind.annotation.*;
  * @since 1.0
  */
 @Api(tags = "收款确认表")
-@RestController("com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest")
-@RequestMapping("/fincollectionconfirmation")
+@RestController("com.yxt.anrui.terminal.biz.finance.AppFinCollectionConfirmationRest")
+@RequestMapping("finance/v1/collectionConfirm")
 public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirmationFeign {
 
     @Autowired
@@ -87,7 +88,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
      */
     @Override
     public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
-        return appfinCollectionConfirmationService.initCollectionConfirm(collectionBillSid,userSid);
+        return appfinCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
     }
 
     /**
@@ -119,7 +120,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
      * @return
      */
     @Override
-    public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.finance;
 
 
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -111,7 +112,7 @@ public class AppFinCollectionConfirmationService {
      * @param pagerQuery
      * @return
      */
-    public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery);
     }
 }