From ea1cfb189f26e9419cda268461c644c2e8620852 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Thu, 18 Aug 2022 16:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=A5=E5=BA=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdeposit/AppBusDepositBusDetailsVo.java | 5 +- .../AppBusDepositDetailInfoQuery.java | 16 ++++ .../api/busdeposit/BusDepositFeign.java | 4 + .../busdeposit/BusDepositFeignFallback.java | 5 ++ .../busmaindeposit/AppBusMainDepositVo.java | 3 + .../biz/busdeposit/BusDepositRest.java | 13 +++ .../biz/busdeposit/BusDepositService.java | 86 ++++++++++++++++--- .../BusDepositVehicleService.java | 28 +++--- .../busmaindeposit/BusMainDepositMapper.xml | 5 +- .../busmaindeposit/BusMainDepositService.java | 4 +- .../ScmVehicleEnterlibraryService.java | 2 +- .../virtualOrders/AppBusMainDepositFeign.java | 4 +- .../AppBusMainDepositFeignFallback.java | 4 +- .../deposit/DepositBusDetailsVo.java | 7 +- .../deposit/DepositBuscenterDto.java | 11 +++ .../deposit/DepositDetailInfoQuery.java | 16 ++++ .../virtualOrders/orders/MainDepositVo.java | 3 + .../vehicle/DepositVehicleDetailsInitVo.java | 4 +- .../vehicle/DepositVehicleDto.java | 4 +- .../virtualOrders/AppBusMainDepositRest.java | 7 +- .../AppBusMainDepositService.java | 10 ++- 21 files changed, 195 insertions(+), 46 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java 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 84b873eba6..bda053d969 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 @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -53,7 +54,7 @@ public class AppBusDepositBusDetailsVo implements Vo { private String remarks; @ApiModelProperty("缴费凭证list") - private List payImages; + private List payImages = new ArrayList<>(); @ApiModelProperty("缴费凭证") private String paymentProof; @@ -71,7 +72,7 @@ public class AppBusDepositBusDetailsVo implements Vo { private String userSid; @ApiModelProperty("客户列表") - private List customerList; + private List customerList = new ArrayList<>(); @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java new file mode 100644 index 0000000000..1a6e4dfafb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busdeposit; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBusDepositDetailInfoQuery implements Query { + private static final long serialVersionUID = 3643117270359470007L; + + @ApiModelProperty("订单sid") + private String virtualOrderSid; + + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java index a3fbcaed12..ed617901ec 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java @@ -38,6 +38,10 @@ public interface BusDepositFeign { @GetMapping("/init/depositDetail/{virtualOrderSid}/{userSid}") public ResultBean depositDetail(@PathVariable("virtualOrderSid") String virtualOrderSid, @PathVariable("userSid") String userSid); + @ApiOperation("App初始化虚拟订单订金收取（可修改/显示页）") + @PostMapping("/init/depositDetailApp") + public ResultBean depositDetailApp(@Valid @RequestBody AppBusDepositDetailInfoQuery query); + @ApiOperation("虚拟订单订金收取详情（不可修改）") @GetMapping("/getDepositInfoDetails/{virtualOrderSid}") public ResultBean getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java index 807dfface6..7b497ed2e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java @@ -30,4 +30,9 @@ public class BusDepositFeignFallback implements BusDepositFeign { return null; } + @Override + public ResultBean depositDetailApp(AppBusDepositDetailInfoQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index 37611e9595..0ab2d32a4c 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 @@ -55,6 +55,9 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty(value = "虚拟订单编号") private String virtualOrderId; + @ApiModelProperty(value = "分公司名称") + private String orgName; + @ApiModelProperty(value = "制单日期") private String virtualOrderDate; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java index d71083f33c..99ff0ffe71 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busdeposit; import com.yxt.anrui.buscenter.api.busdeposit.*; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -35,10 +36,22 @@ public class BusDepositRest implements BusDepositFeign { @Override public ResultBean depositDetail(String virtualOrderSid, String userSid) { + if (StringUtils.isBlank(userSid)){ + return new ResultBean().setMsg("用户sid不能为空"); + } AppBusDepositBusDetailsVo vo = busDepositService.depositDetail(virtualOrderSid, userSid); return new ResultBean().success().setData(vo); } + @Override + public ResultBean depositDetailApp(AppBusDepositDetailInfoQuery query) { + if (StringUtils.isBlank(query.getUserSid())){ + return new ResultBean().setMsg("用户sid不能为空"); + } + AppBusDepositBusDetailsVo vo = busDepositService.depositDetailApp(query); + return new ResultBean().success().setData(vo); + } + @Override public ResultBean getDepositInfoDetails(String virtualOrderSid) { AppBusDepositBuscenterDetailVo vo = busDepositService.getDepositInfoDetails(virtualOrderSid); 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 93d5c84bee..0f49d2ac66 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 @@ -2,23 +2,32 @@ package com.yxt.anrui.buscenter.biz.busdeposit; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; +import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositDetailInfoQuery; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.voms.VOMSAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -50,6 +59,8 @@ public class BusDepositService extends MybatisBaseService list = new ArrayList<>(); if (StringUtils.isNotBlank(vo.getPaymentProof())) { String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof(); @@ -106,6 +126,48 @@ public class BusDepositService extends MybatisBaseService list = new ArrayList<>(); + if (StringUtils.isNotBlank(vo.getPaymentProof())) { + String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof(); + list.add(url); + } + vo.setPayImages(list); + List customerList = busDepositCustomerService.getAppListByBillSid(virtualOrderSid); + if (customerList.size() < 0) { + vo.setCustomerList(new ArrayList<>()); + } + vo.setCustomerList(customerList); + return vo; + } else { + vo.setDepartmentName(data.getName()); + vo.setStaffName(sysUserVo.getName()); + vo.setCreateDate(simpleDateFormat.format(new Date())); + return vo; + } + } + /** * 根据订单sid和用户sid查询虚拟订单订金收取详情 * 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 4c835f2061..d734c8f1cf 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 @@ -15,8 +15,11 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; @@ -58,6 +61,8 @@ public class BusDepositVehicleService extends MybatisBaseService reserveCarDetail(AppBusDepositVehicleDetailsInitQuery query) { if (StringUtils.isBlank(query.getVirtualOrderSid())) { AppBusDepositVehicleDetailsInitVo vo = selCustomerDetaile(query); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - vo.setCreateDate(simpleDateFormat.format(new Date())); - vo.setCarList(new ArrayList<>()); - vo.setUserSid(query.getUserSid()); return new ResultBean().success().setData(vo); } else { AppBusDepositVehicleDetailsInitVo vo = new AppBusDepositVehicleDetailsInitVo(); @@ -248,13 +249,18 @@ public class BusDepositVehicleService extends MybatisBaseService tempDetailsBySid = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(query.getCustomerSid()); - AppUserOrgInfoVo sysUserData = sysUserFeign.getUserOrgInfoByUserSid(query.getUserSid()).getData(); - AppCrmCustomerTempInfoVo data = tempDetailsBySid.getData(); - vo.setCustomerName(data.getName());//客户名称 - vo.setMobile(data.getMobile());//手机号 - vo.setStaffName(sysUserData.getStaffName());//销售专员 - vo.setDepartmentName(sysUserData.getOrgName());//部门名称 + AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(query.getCustomerSid()).getData(); + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + SysOrganizationVo data = sysOrganizationFeign.fetchBySid(orgSid).getData(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + vo.setCustomerName(appCrmCustomerTempInfoVo.getName());//客户名称 + vo.setMobile(appCrmCustomerTempInfoVo.getMobile());//手机号 + vo.setStaffName(sysUserVo.getName());//销售专员 + vo.setDepartmentName(data.getName());//部门名称 + vo.setCreateDate(simpleDateFormat.format(new Date())); + vo.setCarList(new ArrayList<>()); + vo.setUserSid(query.getUserSid()); return vo; } 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 86f5aa12b6..23f279cfe5 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 @@ -42,7 +42,8 @@ bmd.createDate AS virtualOrderDate, bmd.depositBillTypeKey as virtualOrderType, bmd.staffName AS sellerName, - if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, + bmd.orgName, + if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, bmd.remarks FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid @@ -50,7 +51,7 @@ ${ew.sqlSegment} - and bmd.billNo LIKE concat('%' + and bmd.orgName LIKE concat('%' , #{name} , '%') 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 01a9acfab7..a8ac7ab8ff 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 @@ -709,7 +709,7 @@ public class BusMainDepositService extends MybatisBaseService saveDepositInfo(AppBusDepositBuscenterDto dto) { ResultBean rb = ResultBean.fireFail(); - AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); + SysUserVo data = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); //判断订单sid是否有值(无值 新增 有值 修改) @@ -1156,7 +1156,7 @@ public class BusMainDepositService extends MybatisBaseService reserveCarInfo(AppBusDepositVehicleDto dto) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); - AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); + SysUserVo data = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增 BusMainDeposit busMainDeposit = new BusMainDeposit(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index ca39bfecb4..5a9d0aae09 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -358,7 +358,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService depositDetail(@PathVariable("virtualOrderSid") String virtualOrderSid, @PathVariable("userSid") String userSid); + @PostMapping("/init/depositDetail") + public ResultBean depositDetail(@Valid @RequestBody DepositDetailInfoQuery query); @ApiOperation("虚拟订单订金收取详情（不可修改）") @GetMapping("/getDepositInfoDetails/{virtualOrderSid}") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java index d7395e1be1..ee85da46d5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java @@ -93,12 +93,12 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign { return null; } - @Override - public ResultBean depositDetail(String virtualOrderSid, String userSid) { + public ResultBean depositDetail(DepositDetailInfoQuery query) { return null; } + @Override public ResultBean reserveCarDetail(DepositVehicleDetailsInitQuery query) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java index cf53e0b12c..fe42ab73f2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +17,8 @@ public class DepositBusDetailsVo implements Vo { private String virtualOrderId; @ApiModelProperty("制单日期") - private String virtualOrderDate; + @JsonProperty("virtualOrderDate") + private String createDate; @ApiModelProperty("付款人") private String payName; @@ -55,7 +57,8 @@ public class DepositBusDetailsVo implements Vo { private String paymentProof; @ApiModelProperty("销售专员") - private String sellerName; + @JsonProperty("sellerName") + private String staffName; @ApiModelProperty("部门名称") private String departmentName; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java index 9c89f5dae0..b5ccbf5cfa 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; @@ -79,4 +80,14 @@ public class DepositBuscenterDto implements Dto { @ApiModelProperty("收款银行") private String collectionBankKey; + @ApiModelProperty("申请人") + @JsonProperty("sellerName") + private String staffName; + + @ApiModelProperty("分公司") + private String departmentName; + + @ApiModelProperty("制单日期") + private String createDate; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java new file mode 100644 index 0000000000..6a3d8a83d6 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DepositDetailInfoQuery implements Query { + + private static final long serialVersionUID = -8558418138668642644L; + @ApiModelProperty("订单sid") + private String virtualOrderSid; + + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java index 15ef9a4352..222a4c88d2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java @@ -15,6 +15,9 @@ public class MainDepositVo implements Vo { @ApiModelProperty(value = "虚拟订单编号") private String virtualOrderId; + @ApiModelProperty(value = "分公司名称") + private String orgName; + @ApiModelProperty(value = "制单日期") private String virtualOrderDate; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java index b4e426c42c..257d81f329 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -27,7 +28,8 @@ public class DepositVehicleDetailsInitVo implements Vo { private String mobile; @ApiModelProperty(value = "销售专员") - private String sellerName; + @JsonProperty("sellerName") + private String staffName; @ApiModelProperty(value = "部门名称") private String departmentName; @ApiModelProperty(value = "用户sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java index 68d9d15c25..5ce423aa47 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; @@ -22,7 +23,8 @@ public class DepositVehicleDto implements Dto { @ApiModelProperty("订单编号") private String virtualOrderId; @ApiModelProperty("业务员名称") - private String sellerName; + @JsonProperty("sellerName") + private String staffName; @ApiModelProperty("部门名称") private String departmentName; @ApiModelProperty("手机号") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java index 878919270c..8a7b4befb7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java @@ -140,13 +140,12 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign { /** * 初始化虚拟订单订金收取（可修改/显示页） * - * @param virtualOrderSid - * @param userSid + * @param query * @return */ @Override - public ResultBean depositDetail(String virtualOrderSid, String userSid) { - return appBusMainDepositService.depositDetail(virtualOrderSid, userSid); + public ResultBean depositDetail(DepositDetailInfoQuery query) { + return appBusMainDepositService.depositDetail(query); } /** diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java index 6d8522b786..7d08030769 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.query.Query; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.BeanUtils; @@ -193,14 +194,15 @@ public class AppBusMainDepositService { /** * 初始化虚拟订单订金收取（可修改/显示页） * - * @param virtualOrderSid - * @param userSid + * @param query * @return */ - public ResultBean depositDetail(String virtualOrderSid, String userSid) { + public ResultBean depositDetail(DepositDetailInfoQuery query) { ResultBean rb = ResultBean.fireFail(); DepositBusDetailsVo vo = new DepositBusDetailsVo(); - ResultBean resultBean = busDepositFeign.depositDetail(virtualOrderSid, userSid); + AppBusDepositDetailInfoQuery appBusDepositDetailInfoQuery = new AppBusDepositDetailInfoQuery(); + BeanUtils.copyProperties(query, appBusDepositDetailInfoQuery); + ResultBean resultBean = busDepositFeign.depositDetailApp(appBusDepositDetailInfoQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); }