From ef4bc2a349523e9517a532fa67be68e88153966e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Jun 2022 11:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=84=8F=E5=90=91=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCrmVehicleDemandUpdateDto.java | 7 +- .../crmvehicledemand/CrmVehicledemandDto.java | 88 ++++++++++--------- .../CrmVehicledemandFeign.java | 5 +- .../RemindCustomerScheduledService.java | 2 +- 4 files changed, 56 insertions(+), 46 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java index 3a9aa36b98..d09beb7823 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicleDemandUpdateDto.java @@ -2,13 +2,16 @@ package com.yxt.anrui.crm.api.crmvehicledemand; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; +import javax.validation.constraints.NotBlank; + @Data public class AppCrmVehicleDemandUpdateDto implements Dto { + private static final long serialVersionUID = -4465869100864862986L; @ApiModelProperty("购车方式类型") + @NotBlank(message = "购车方式类型不能为空") private String purchaseMethod; @ApiModelProperty("购车方式value") @@ -18,9 +21,11 @@ public class AppCrmVehicleDemandUpdateDto implements Dto { private String remarks; @ApiModelProperty("数量") + @NotBlank(message = "数量不能为空") private String number; @ApiModelProperty("提车日期") + @NotBlank(message = "提车日期不能为空") private String date; @ApiModelProperty("车型报价") diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java index 994d014e3e..b15ecfc8b2 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java @@ -1,14 +1,14 @@ package com.yxt.anrui.crm.api.crmvehicledemand; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; +import javax.validation.constraints.NotBlank; /** * Project: anrui-crm(客户管理)
@@ -27,58 +27,62 @@ import java.math.BigDecimal; @Data public class CrmVehicledemandDto implements Dto { - - @ApiModelProperty("潜在客户信息sid") + + private static final long serialVersionUID = 5797385882721938579L; + @ApiModelProperty("潜在客户信息sid") private String customerSid; - - @ApiModelProperty("购车方式") + + @ApiModelProperty("购车方式") + @NotBlank(message = "购车方式不能为空") private String purchaseMethod; - - @ApiModelProperty("品牌sid") - private String brandSid; - - @ApiModelProperty("品牌名称") - private String brandName; - - @ApiModelProperty("车型sid") + @ApiModelProperty("购车方式Value") + private String purchaseMethodValue; + @ApiModelProperty("数量") + @NotBlank(message = "数量不能为空") + private String number; + @ApiModelProperty("预计提车日期") + @JsonProperty(value = "date") + @NotBlank(message = "预计提车日期不能为空") + private String estimatedPickupDate; + @ApiModelProperty("车型sid") + @NotBlank(message = "请选择车型") private String modelSid; - - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") + @NotBlank(message = "参数错误：车型名称是必选项") + @JsonProperty(value = "model") private String modelName; - - @ApiModelProperty("简述配置") + @ApiModelProperty("销售参考价") + @NotBlank(message = "参数错误：销售指导价是必选项") + @JsonProperty(value = "guidancePrice") + private String saleReferencePrice; + @ApiModelProperty("品牌名称") + @NotBlank(message = "参数错误：品牌名称是必选项") + @JsonProperty(value = "brand") + private String brandName; + @ApiModelProperty("品牌sid") + @NotBlank(message = "请选择品牌") + private String brandSid; + @ApiModelProperty("车型报价") + @JsonProperty(value = "price") + private String vehicleModelOffer; + @ApiModelProperty("常用配置sid") + @NotBlank(message = "请选择常用配置") + @JsonProperty(value = "configSid") + private String comonConfigSid; + @ApiModelProperty("简述配置") + @NotBlank(message = "参数错误：简述配置是必选项") + @JsonProperty(value = "configName") private String sketChconfiguration; - - @ApiModelProperty("其它配置说明") + @ApiModelProperty("其它配置说明") + @NotBlank(message = "参数错误：其他配置说明是必选项") private String otherConfig; @ApiModelProperty("换选装内容") private String changeOptions; - - @ApiModelProperty("车型报价") - private BigDecimal vehicleModelOffer; - - @ApiModelProperty("数量") - private String number; - - @ApiModelProperty("预计提车日期 ") - private String estimatedPickupDate; - - @ApiModelProperty("是否意向（0为非意向，1为意向）") + @ApiModelProperty("是否意向（0为非意向，1为意向）") private String states; - - @ApiModelProperty("销售参考价") - private BigDecimal saleReferencePrice; - @ApiModelProperty("客户金融需求") private CrmFindemandDto crmFindemandDto; - - @ApiModelProperty("常用配置sid") - private String comonConfigSid; - - @ApiModelProperty("购车方式Value") - private String purchaseMethodValue; - @ApiModelProperty("备注") private String remarks; } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java index d2698cb6c6..ef5c21d9c4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -58,7 +59,7 @@ public interface CrmVehicledemandFeign { */ @ApiOperation("新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody CrmVehicledemandDto dto); + public ResultBean save(@Valid @RequestBody CrmVehicledemandDto dto); /** * 意向车型的修改保存 @@ -115,7 +116,7 @@ public interface CrmVehicledemandFeign { @ApiOperation("手机端-修改意向车型（新）") @ResponseBody @PutMapping("/saveVisitDemands") - public ResultBean saveVisitDemands(@RequestBody AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto); + public ResultBean saveVisitDemands(@Valid @RequestBody AppCrmVehicleDemandUpdateDto appCrmVehicleDemandUpdateDto); @ApiOperation("手机端-意向车型详情（新）") @ResponseBody diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java index 509c7544d6..f777d843c2 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java @@ -33,7 +33,7 @@ public class RemindCustomerScheduledService { @Autowired private KafkaTemplate kafkaTemplate; - @Scheduled(cron = "00 00 10 * * ?") + @Scheduled(cron = "0 0 10 * * ?") public void remindCustomer() { String today = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); List list = customerTempService.selectRemindCustomerTempList(today);