From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 54dfd5a..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 String storeId;
+ 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