From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
index ad131b4..af5865f 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -15,12 +16,13 @@
/**
* 收货地址ID
*/
+ @NotNull(message = "请选择正确的收获地址")
private Integer receiveAddrId;
/**
* 配送方式（1=物流，2=门店自取）
*/
- private String deliverySelect;
+ private Integer deliverySelect;
/**
* 配送门店ID
@@ -37,7 +39,11 @@
*/
private Integer joinActive;
-
+ /**
+ * 支付方式1微信，2 vipCard余额
+ */
+ @NotNull(message = "请选择支付方式")
+ private Integer payMethod;
/**
* 订单备注
--
Gitblit v1.9.1