From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java b/java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java
index 4a717a8..68d9bd1 100644
--- a/java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java
@@ -16,11 +16,19 @@
* add by wuxw 2019/4/24
**/
public class ReserveGoodsOrderDto extends PageDto implements Serializable {
-
+ public static final String STATE_S = "S"; //棰勭害鎴愬姛
+ public static final String STATE_F = "F";//棰勭害澶辫触
+ public static final String STATE_W = "W";//寰呭鏍�
+ public static final String STATE_WP = "WP";//寰呮敮浠�
+ public static final String STATE_CL = "CL";//鍙栨秷棰勭害
private String orderId;
private String goodsId;
+ private String goodsName;
+
+ private String goodsNameLike;
private String receivableAmount;
private String payWay;
+ private String payWayName;
private String remark;
private String receivedAmount;
private String type;
@@ -29,6 +37,7 @@
private String appointmentTime;
private String personId;
private String state;
+ private String stateName;
private String personTel;
private String communityId;
@@ -176,4 +185,36 @@
public void setTimes(List<ReserveGoodsOrderTimeDto> times) {
this.times = times;
}
+
+ public String getPayWayName() {
+ return payWayName;
+ }
+
+ public void setPayWayName(String payWayName) {
+ this.payWayName = payWayName;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public String getGoodsNameLike() {
+ return goodsNameLike;
+ }
+
+ public void setGoodsNameLike(String goodsNameLike) {
+ this.goodsNameLike = goodsNameLike;
+ }
}
--
Gitblit v1.8.0