From 4163c77fcf3edb929c19d0ba0f3fadddbf32ab18 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 9 May 2022 19:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E3=80=81=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=AD=E9=94=80=E5=94=AE=E6=94=BF?= =?UTF-8?q?=E7=AD=96=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackage.java | 2 +- .../BaseSalesDicountVo.java | 16 +++++++ .../basevehicle/PcBaseVehicleOrderQuery.java | 2 +- .../BaseAffiliatCompanyService.java | 13 ++--- .../BaseVehmodelConfigService.java | 3 ++ .../BusDepositFictitiousDto.java | 2 - .../bussalesorder/BusSalesOrderAllDto.java | 47 ++++++++++++++----- .../api/bussalesorder/BusSalesOrderFeign.java | 2 +- .../bussalesorder/BusSalesOrderFlowDto.java | 33 ++++++------- .../BusSalesOrderDepositDto.java | 4 +- .../BusSalesOrderInsuranceDto.java | 4 +- .../BusSalesOrderPriceDto.java | 2 +- .../biz/bussalesorder/BusSalesOrderRest.java | 6 +++ .../CrmVehicledemandMapper.xml | 2 +- 14 files changed, 90 insertions(+), 48 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java index 2d3354b1db..98a128598c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java @@ -25,7 +25,7 @@ import lombok.Data; public class BaseDiscountpackage extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("优惠情况") + @ApiModelProperty("sid") private String sid; @ApiModelProperty("优惠类型key") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java new file mode 100644 index 0000000000..a6117f8dae --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.base.api.basediscountpackage; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/9 18:47 + * @Description + */ +@Data +public class BaseSalesDicountVo implements Vo { + private static final long serialVersionUID = 4299591364332099379L; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java index 30acfdf610..08b2652c4a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java @@ -28,6 +28,6 @@ public class PcBaseVehicleOrderQuery implements Query { @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择") private Integer type; - @ApiModelProperty(value = "已选择的车辆的车架号") + @ApiModelProperty(value = "已选择的车辆的sid") private List sidList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java index 8e6da25b64..f6afdf4eb9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java @@ -43,6 +43,7 @@ public class BaseAffiliatCompanyService extends MybatisBaseService list = companyAppendixService.selByLinkSid(sid); + if (baseAffiliatCompanyDetailsVo != null) { + String path = ""; + List list = companyAppendixService.selByLinkSid(sid); for (BaseAffiliatCompanyAppendixVo baseAffiliatCompanyAppendixVo : list) { String filePath = baseAffiliatCompanyAppendixVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); @@ -131,7 +132,7 @@ public class BaseAffiliatCompanyService extends MybatisBaseService list = Arrays.asList(baseAffiliatCompany.getUseOrg().split(",")); @@ -174,13 +175,13 @@ public class BaseAffiliatCompanyService extends MybatisBaseService stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(staffSid); if (stringResultBean.getSuccess()) { orgSid = stringResultBean.getData(); } - qw.lambda().apply("FIND_IN_SET ('"+orgSid+"',bac.useOrg)"); + qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',bac.useOrg)"); } return baseMapper.namesDown(qw); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 1503b2ede2..c5f716f1ca 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -383,6 +383,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService selectOne(String modelSid, String configSid) { ResultBean rb = ResultBean.fireFail(); BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid); + if(vo == null){ + return rb.setData(new BaseVehmodelVo()); + } return rb.success().setData(vo); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java index 8a1dd3a0e7..a352c5bed1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java @@ -51,8 +51,6 @@ public class BusDepositFictitiousDto implements Dto { private static final long serialVersionUID = 1634109479048286985L; @ApiModelProperty("虚拟订单编号") private String depositBillNo; - @ApiModelProperty("订金信息sid") - private String depositSid; @ApiModelProperty("订金剩余金额") private String depositPrice; @ApiModelProperty("本次结转金额") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 48a8af5968..bca5e57e90 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -14,6 +14,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -27,33 +29,44 @@ public class BusSalesOrderAllDto implements Dto { private static final long serialVersionUID = -734571880207951780L; private String sid; - - @ApiModelProperty(value = "用户sid") + @ApiModelProperty(value = "用户sid", required = true) + @NotBlank(message = "用户sid不能为空") private String userSid; - @ApiModelProperty("销售部门sid") + @ApiModelProperty(value = "销售部门sid", required = true) + @NotBlank(message = "销售部门sid不能为空") private String orgSid; - @ApiModelProperty("销售部门") + @ApiModelProperty(value = "销售部门", required = true) + @NotBlank(message = "销售部门不能为空") private String orgName; - @ApiModelProperty("客户名称") + @ApiModelProperty(value = "客户名称", required = true) + @NotBlank(message = "客户名称不能为空") private String customerName; - @ApiModelProperty("客户sid") + @ApiModelProperty(value = "客户sid", required = true) + @NotBlank(message = "客户sid不能为空") private String customerSid; - @ApiModelProperty("销售专员") + @ApiModelProperty(value = "销售专员", required = true) + @NotBlank(message = "销售专员不能为空") private String staffName; - @ApiModelProperty("销售专员sid") + @ApiModelProperty(value = "销售专员sid", required = true) + @NotBlank(message = "销售专员sid不能为空") private String staffSid; - @ApiModelProperty("客户联系电话") + @ApiModelProperty(value = "客户联系电话", required = true) + @NotBlank(message = "客户联系电话不能为空") private String mobile; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("制单日期") private Date createDate; - @ApiModelProperty("开票类型key") + @ApiModelProperty(value = "开票类型key", required = true) + @NotBlank(message = "开票类型key不能为空") private String billingTypeKey; @ApiModelProperty("开票类型value") + @NotBlank(message = "开票类型不能为空") private String billingType; @ApiModelProperty("付款方式key") + @NotBlank(message = "付款方式key不能为空") private String payTypeKey; @ApiModelProperty("付款方式value") + @NotBlank(message = "付款方式不能为空") private String payType; @ApiModelProperty("挂靠公司sid") private String affiliatedCompanySid; @@ -66,8 +79,10 @@ public class BusSalesOrderAllDto implements Dto { @ApiModelProperty("是否包含上装") private String isTop; @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") + @NotBlank(message = "销售订单车辆类型不能为空") private String type; @ApiModelProperty(value = "主车车型信息") + @NotNull(message = "车型信息不能为空") private BusSalesOrderModelDto busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") private List busSalesOrderVehicleList; @@ -85,4 +100,14 @@ public class BusSalesOrderAllDto implements Dto { private BusSalesOrderDepositDto busSalesOrderDeposit; @ApiModelProperty(value = "虚拟订单和订金关联信息") private List busDepositFictitiousList; + + @ApiModelProperty(value = "客户类型key", required = true) + @NotBlank(message = "客户类型key不能为空") + private String customerClassKey; + @ApiModelProperty(value = "客户类型", required = true) + @NotBlank(message = "客户类型不能为空") + private String customerClass; + @ApiModelProperty(value = "客户头像", required = true) + @NotBlank(message = "客户头像不能为空") + private String customerPhoto; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 0fe8c28aa7..423d017399 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -60,7 +60,7 @@ public interface BusSalesOrderFeign { public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") - @PostMapping("/save") + @PostMapping("/saveOrUpdate") @ResponseBody public ResultBean save(@RequestBody BusSalesOrderAllDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFlowDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFlowDto.java index 0cc025419c..251ceb7c46 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFlowDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFlowDto.java @@ -4,11 +4,6 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @Author dimengzhe * @Date 2022/5/6 15:13 @@ -24,8 +19,8 @@ public class BusSalesOrderFlowDto implements Dto { @ApiModelProperty("任务Id") private String taskId; - @ApiModelProperty("用户Id") - private String userId; +// @ApiModelProperty("用户Id") +// private String userId; @ApiModelProperty("用户Sid") private String userSid; @@ -35,18 +30,18 @@ public class BusSalesOrderFlowDto implements Dto { @ApiModelProperty("流程实例Id") private String instanceId; - @ApiModelProperty("节点") - private String targetKey; - - @ApiModelProperty("流程变量信息") - private Map values = new HashMap<>(); - - @ApiModelProperty("审批人") - private String assignee; +// @ApiModelProperty("节点") +// private String targetKey; - @ApiModelProperty("候选人") - private List candidateUsers = new ArrayList<>(); +// @ApiModelProperty("流程变量信息") +// private Map values = new HashMap<>(); - @ApiModelProperty("审批组") - private List candidateGroups = new ArrayList<>(); +// @ApiModelProperty("审批人") +// private String assignee; +// +// @ApiModelProperty("候选人") +// private List candidateUsers = new ArrayList<>(); +// +// @ApiModelProperty("审批组") +// private List candidateGroups = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java index 436f167553..eb6c22e47c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java @@ -54,12 +54,12 @@ public class BusSalesOrderDepositDto implements Dto { @ApiModelProperty("单台订金") private BigDecimal deposit; @ApiModelProperty("订金合计") - private BigDecimal depositAll; + private String depositAll; @ApiModelProperty("订金交纳方式") private String depositType; @ApiModelProperty("订金交纳方式key") private String depositTypeKey; @ApiModelProperty("需补交订金") - private BigDecimal makeUpDeposit; + private String makeUpDeposit; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java index 9b89133bd0..94d4067775 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java @@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderInsuranceDto.java
@@ -54,7 +52,7 @@ public class BusSalesOrderInsuranceDto implements Dto { @ApiModelProperty("保险公司名称") private String insuranceName; @ApiModelProperty("单台车保费预估金额") - private BigDecimal insuranceCarMoney; + private String insuranceCarMoney; @ApiModelProperty("公司入保期数") private Integer insuranceNum; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java index e6335df717..d5d2cbf687 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java @@ -62,7 +62,7 @@ public class BusSalesOrderPriceDto implements Dto { private String priceSum; @ApiModelProperty("计划提车地点") private String plannedPickUpLocation; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("计划提车日期") private Date plannedPickUpDate; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index cd9d635b81..ca72f7a66b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -80,6 +80,12 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return busSalesOrderService.saveOrUpdateOrder(dto); } + /** + * 删除/批量删除销售订单 + * + * @param sids 销售订单sid数组 + * @return + */ @Override public ResultBean delBySids(String[] sids) { return busSalesOrderService.deleteSids(sids); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 2c790205de..344431ad2f 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -120,7 +120,7 @@