diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java index 0b0c3f2d08..2094bfba4e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java +++ b/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; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListDto.java index 0f2aea867e..928f96dfc6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListDto.java +++ b/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") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListVo.java index 6ea4fe415e..3a5ea27153 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleCarListVo.java +++ b/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") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java index d75eefb503..11873c922e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java +++ b/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 vehicleList; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java index 66482a9aba..1472436d54 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java +++ b/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 carList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java index 83ecfa6cdc..93b41cd829 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java +++ b/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 carList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomer.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomer.java index 9ab5429488..86f844ad21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomer.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomerVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomerVo.java index 6150792590..9a710c4126 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehiclecustomer/BusDepositVehicleCustomerVo.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java index dd77b9ae2c..faa5de2eb4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java +++ b/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; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositFlowTask.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositFlowTask.java new file mode 100644 index 0000000000..b920c9f822 --- /dev/null +++ b/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; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index 635bf8ac15..5251d61d16 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/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; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java index d8ba81f63b..854c9f4b11 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java +++ b/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(车辆订单)
@@ -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("虚拟订单列表（新）") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java index 5b711363ac..6901ce0388 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java +++ b/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(车辆订单)
@@ -49,116 +53,166 @@ import java.util.List; @Component public class BusMainDepositFeignFallback implements BusMainDepositFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busmaindeposit/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busmaindeposit/listPage无法访问"); + } @Override - public ResultBean> listAll(BusMainDepositQuery query){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busmaindeposit/listAll无法访问"); - } + public ResultBean> 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 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> getVirtualOrders(PagerQuery 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 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> getVirtualOrders(PagerQuery 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; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index b83bc035c8..462be4b475 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/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, diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index e271ea6de7..d8ce0a2e19 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/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()); } vo.setCustomerList(customerList); - send(vo.getPayName()); +// send(vo.getPayName()); return vo; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml index f66d7c7949..0074c29027 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml +++ b/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} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index 68c1fbae94..d94d241271 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/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()); + vo.setUserSid(query.getUserSid()); return new ResultBean().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 carList = baseMapper.selByBillSidList(virtualOrderSid); if (carList.size() > 0) { vo.setCarList(carList); @@ -238,7 +242,7 @@ public class BusDepositVehicleService extends MybatisBaseService 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 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 appBusDepositVehicleCarListVos = baseMapper.selByBillSidList(virtualOrderSid); - AppBusDepositVehicleCarListVo appBusDepositVehicleCarListVo = appBusDepositVehicleCarListVos.get(0); - String customerSid = appBusDepositVehicleCarListVo.getCustomerSid(); - ResultBean 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 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 appBusDepositVehicleListVos = baseMapper.selVehicleListByBillSid(virtualOrderSid); + vo.setVehicleList(appBusDepositVehicleListVos); return new ResultBean().success().setData(vo); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java index ae996193c7..8b14b3c0ef 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java +++ b/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(车辆订单)
@@ -88,4 +89,8 @@ public interface BusMainDepositMapper extends BaseMapper { */ 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 map); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 7193f3f9f7..d2cbf293e8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/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} + update bus_main_deposit set procDefId=#{procDefId}, @@ -115,4 +120,16 @@ nodeSid=#{nodeSid} where sid = #{businessSid} + + + UPDATE bus_main_deposit + SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInsId=#{procInsId} + + WHERE sid=#{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java index a5a1d34360..bf2a3a1d94 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java +++ b/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(车辆订单)
@@ -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); + } + /****************************************************************************************************/ /** * 虚拟订单列表（新） * diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 65fde222a6..9a83c0e0c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/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 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 resultBean = flowTaskFeign.businessComplete(bv); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = ""; + String taskDefKey = ""; + Map paramMap = new HashMap<>(); + paramMap.put("sid", variables.get("businessSid").toString()); + if (resultBean.getData() != null) { + ResultBean> 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 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 resultBean = flowTaskFeign.businessComplete(bv); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = ""; + String taskDefKey = ""; + Map paramMap = new HashMap<>(); + paramMap.put("sid", variables.get("businessSid").toString()); + if (resultBean.getData() != null) { + ResultBean> 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> 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 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> 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 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 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 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 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 resultBean = flowTaskFeign.businessComplete(bv); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = ""; + String taskDefKey = ""; + Map paramMap = new HashMap<>(); + paramMap.put("sid", variables.get("businessSid").toString()); + if (resultBean.getData() != null) { + ResultBean> 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 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 resultBean = flowTaskFeign.businessComplete(bv); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = ""; + String taskDefKey = ""; + Map paramMap = new HashMap<>(); + paramMap.put("sid", variables.get("businessSid").toString()); + if (resultBean.getData() != null) { + ResultBean> 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> 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 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> 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 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 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; + + } + + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java index 87f1403194..eca0018dbf 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempInfoVo.java +++ b/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; + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 4d1f511560..7f06e94a39 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/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} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java index b08573f718..eedb37204d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java +++ b/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 sidList; + @ApiModelProperty("分公司sid") + private String useOrgSid; + + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index b2f20ba2c6..ddd138fb47 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -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> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index ebb2deabd7..74f43fe600 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -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> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return null; } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java new file mode 100644 index 0000000000..0800f7bdee --- /dev/null +++ b/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; + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 7819e1ba5e..4324cdddc1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -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> getPaymentDetailsList(PagerQuery pagerQuery) { - PagerVo page = new PagerVo<>(); - IPage iPage = finCollectionConfirmationService.getPaymentDetailsList(pagerQuery); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + IPage iPage = finCollectionConfirmationService.getPaymentDetailsList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0ccf67b60b..80935f04cc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -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 getPaymentDetailsList(PagerQuery pagerQuery) { + public IPage getPaymentDetailsList(PagerQuery 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 page = PagerUtil.queryToPage(pagerQuery); - QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); + QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); List sidList = pagerQuery.getParams().getSidList(); - IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); + IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); + List 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 appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) { - QueryWrapper qw = new QueryWrapper<>(); + private QueryWrapper appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) { + QueryWrapper 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 getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index de40e5cf28..3e36df2ce1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -21,29 +21,18 @@ - 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 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 69446a8847..4247e1a6ec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -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 getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) { + public IPage getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) { return baseMapper.getPaymentDetailsList(sidList, page, qw); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeign.java index 70f58b1f59..212bd21e61 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeign.java +++ b/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(车辆订单)
@@ -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); + /************************************** 订金收取 ********************************************/ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeignFallback.java index 32c01c6bfe..e0a8aa418b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeignFallback.java +++ b/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(车辆订单)
@@ -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 getDepositInfoDetails(String virtualOrderSid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java index c2904f68bd..b9afb794cc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java +++ b/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> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java index f0a207dd46..2c5d7025bc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java +++ b/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> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 2488d3063a..ed2c42ae9d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/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) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositRest.java index 49e7bf876d..8a26b32bae 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositRest.java +++ b/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(车辆订单)
@@ -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); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositService.java index 834b77d95a..1f4b3115f0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositService.java +++ b/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; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java index 5fe6bbed82..8f175e9549 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java +++ b/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 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> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java index cefba38f80..8203bdac5c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java +++ b/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> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); } } \ No newline at end of file