From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Thu, 17 Jul 2025 18:07:08 +0800 Subject: [PATCH] Merge branch 'xin' into pxb --- oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java b/oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java index 7119f9d..37c0b10 100644 --- a/oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java +++ b/oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java @@ -5,7 +5,8 @@ import lombok.Getter; import lombok.Setter; -import java.sql.Timestamp; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -17,16 +18,21 @@ @Setter public class SubmitOrder { + @NotNull(message = "地址不能为空") @ApiModelProperty(value = "地址ID") private Long addressId; + @NotBlank(message = "送达时间不能为空") @ApiModelProperty(value = "送达时间") - private Timestamp dateTime; + private String dateTime; + @NotNull(message = "门店不能为空") @ApiModelProperty(value = "门店ID") private Long storeId; + @NotNull(message = "商品不能为空") @ApiModelProperty(value = "商品&数量") private List<ProductOrder> products; @ApiModelProperty(value = "备注") private String remark; + @NotNull(message = "支付类型不能为空") @ApiModelProperty(value = "支付类型") private PayTypeEnum payType; -- Gitblit v1.9.3