From d3b8fa1f91b9817b14fba6be5c89b2c5a8024564 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 16 May 2022 12:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BD=A6=E5=9E=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=88=E5=90=8C=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=90=88=E5=90=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppBaseConfigNowCarQuery.java | 25 +++++++ .../basevehicle/AppBaseConfigNowCarVo.java | 23 ++++++ .../api/basevehicle/AppBaseVinNowCarVo.java | 25 +++++++ .../api/basevehicle/BaseVehicleFeign.java | 4 +- .../basevehicle/BaseVehicleFeignFallback.java | 5 ++ .../AppCommonContractInitVo.java | 70 ++++++++++++++++++ .../AppCommonContractPageVo.java | 35 +++++++++ .../AppCommonContractQuery.java | 38 ++++++++++ .../commoncontract/AppCrmCustomerFileDto.java | 71 +++++++++++++++++++ .../api/commoncontract/CommonContract.java | 3 + .../commoncontract/CommonContractFeign.java | 17 ++++- .../CommonContractFeignFallback.java | 15 ++++ 12 files changed, 328 insertions(+), 3 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarQuery.java new file mode 100644 index 0000000000..02358bb35d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBaseConfigNowCarQuery implements Query { + + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("配置sid") + private String configSid; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("分公司sid") + private String useOrg; + + @ApiModelProperty("只考虑车架号") + private String names; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java new file mode 100644 index 0000000000..e8ade060a7 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppBaseConfigNowCarVo implements Vo { + + @ApiModelProperty("车型名称") + private String modelName; + + @ApiModelProperty("销售指导价") + private String price; + + @ApiModelProperty("现车列表") + private List records; + + @ApiModelProperty("常用配置") + private String commonlyConfig; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java new file mode 100644 index 0000000000..db75b89dbc --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBaseVinNowCarVo implements Vo { + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("状态") + private String state; + + @ApiModelProperty("颜色") + private String color; + + @ApiModelProperty("合格证") + private String certificate; + + @ApiModelProperty("存放地点") + private String address; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index c9337264ec..c948d916a9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -233,5 +233,7 @@ public interface BaseVehicleFeign { @GetMapping("/carConfigSummary/{modelSid}/{configSid}") public ResultBean getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); - + @ApiOperation("手机端-配置列表获取现车列表") + @PostMapping("/getModelNowCarList") + public ResultBean getModelNowCarList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 37b05b291a..ff15dea6f0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -159,4 +159,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean getModelNowCarList(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java new file mode 100644 index 0000000000..95fb04551b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java @@ -0,0 +1,70 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppCommonContractInitVo implements Vo { + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("单台价格") + private String price; + + @ApiModelProperty("数量") + private String number; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("乙方名称") + private String partyB; + + @ApiModelProperty("合同编号") + private String contractId; + + @ApiModelProperty("合同价格") + private String contractPrice; + + @ApiModelProperty("新车买卖合同") + private List contractImages; + + @ApiModelProperty("现场签署图片") + private List siteSigImages; + + @ApiModelProperty("身份证图片") + private List idCardImages; + + @ApiModelProperty("客户类型") + private String customerKey; + + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("流程实例id") + private String procInsId; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("是否是档案库里的身份证") + private boolean idCardArchives; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("合同附件") + private String appdixUrl; + + @ApiModelProperty("现场签署图片附件") + private String sceneSignUrl; + + @ApiModelProperty("身份证图片") + private String idImagesUrl; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java new file mode 100644 index 0000000000..0b091a91e9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCommonContractPageVo implements Vo { + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("合同编号") + private String contractId; + + @ApiModelProperty("合同类型") + private String contractType; + + @ApiModelProperty("乙方名称") + private String partyB; + + @ApiModelProperty("经办人") + private String handler; + + @ApiModelProperty("合同金额") + private String contractPrice; + + @ApiModelProperty("是否显示办理按钮") + private boolean isShowUpdate; + + @ApiModelProperty("节点状态") + private String nodeState; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java new file mode 100644 index 0000000000..afcbca2994 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.base.api.commoncontract; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(安瑞基础)
+ * File: CommonContractQuery.java
+ * Class: com.yxt.anrui.base.api.commoncontract.CommonContractQuery
+ * Description: 合同表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-10-12 14:02:40
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "合同表 查询条件", description = "合同表 查询条件") +@Data +public class AppCommonContractQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("合同类型key") + private String type; + + @ApiModelProperty("") + private String names; + + @ApiModelProperty("业务员sid") + private String staffSid; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java new file mode 100644 index 0000000000..7b6240f03a --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCrmCustomerFileDto.java @@ -0,0 +1,71 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class AppCrmCustomerFileDto implements Dto { + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("单台价格") + private BigDecimal price; + + @ApiModelProperty("数量") + private String number; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("乙方名称") + private String partyB; + + @ApiModelProperty("合同编号") + private String contractId; + + @ApiModelProperty("合同价格") + private String contractPrice; + + @ApiModelProperty("新车买卖合同") + private List contractImages; + + @ApiModelProperty("现场签署图片") + private List siteSigImages; + + @ApiModelProperty("身份证图片") + private List idCardImages; + + @ApiModelProperty("客户类型") + private String customerKey; + + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("流程实例id") + private String procInsId; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("是否是档案库里的身份证") + private boolean idCardArchives; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("合同附件") + private String appdixUrl; + + @ApiModelProperty("现场签署图片附件") + private String sceneSignUrl; + + @ApiModelProperty("身份证图片") + private String idImagesUrl; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 6651b06498..c4db5f1be0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -84,6 +84,9 @@ public class CommonContract extends BaseEntity { @ApiModelProperty("现场签署图片附件") private String sceneSignUrl; + @ApiModelProperty("身份证信息附件") + private String idImagesUrl; + @ApiModelProperty("车型名称") private String modelName; @ApiModelProperty("台数") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index afc3c2da1a..bc46130c2d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -66,7 +66,6 @@ public interface CommonContractFeign { public ResultBean selectByBusSid(@RequestParam("busSid") String busSid); - /************************************手机端接口*******************************************/ @ApiOperation("根据sid更新合同订金") @@ -106,7 +105,6 @@ public interface CommonContractFeign { /*****************************************************************************************/ /** - * * @param sids * @return */ @@ -145,4 +143,19 @@ public interface CommonContractFeign { /**************************************************************************************************************************************/ + @ApiOperation("移动端-合同审核列表") + @PostMapping("/getContractList") + @ResponseBody + public ResultBean> getContractList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("移动端-初始化合同审核") + @PostMapping("/getContractInfo/{contractSid}/{userSid}") + @ResponseBody + public ResultBean getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid); + + @ApiOperation("移动端-保存合同审核") + @PostMapping("/saveContractInfo") + @ResponseBody + public ResultBean saveContractInfo(@RequestBody AppCrmCustomerFileDto dto); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index ce5051555e..508f38fcbf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -150,4 +150,19 @@ public class CommonContractFeignFallback implements CommonContractFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/commoncontract/submitCarSaleContractApprove无法访问"); } + + @Override + public ResultBean> getContractList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean getContractInfo(String contractSid, String userSid) { + return null; + } + + @Override + public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) { + return null; + } } \ No newline at end of file