From 05a82deffa89a22fa35abaa9196053f43cbc1103 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:51:07 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
index 63f102e..8a152db 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java
@@ -1,5 +1,6 @@
package com.matrix.system.padApi.dto;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,8 +11,19 @@
@ApiModel(value = "PadOrderListDto", description = "订单列表接收参数类")
public class PadOrderListDto extends BasePageDto {
- @ApiModelProperty(value = "订单状态 0-全部 1-待付款 2-已付款 3-欠款 全部默认传空字符串", example = "1")
+ @ApiModelProperty(value = "订单状态 0-全部 1-待付款 2-已付款 3-欠款 4-已取消 全部默认传空字符串", example = "1")
private Integer orderStatus;
+
+ public Long getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(Long vipId) {
+ this.vipId = vipId;
+ }
+
+ @ApiModelProperty(value = "会员id", example = "1")
+ private Long vipId;
@ApiModelProperty(hidden = true)
private String status;
@@ -21,6 +33,28 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date orderTime;
+
+ public Date getBeginTimeVo() {
+ return beginTimeVo;
+ }
+
+ public void setBeginTimeVo(Date beginTimeVo) {
+ this.beginTimeVo = beginTimeVo;
+ }
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ private Date beginTimeVo;
+
+ public Date getEndTimeVo() {
+ return endTimeVo;
+ }
+
+ public void setEndTimeVo(Date endTimeVo) {
+ this.endTimeVo = endTimeVo;
+ }
+
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ private Date endTimeVo;
@ApiModelProperty(hidden = true)
private Long shopId;
@@ -87,6 +121,9 @@
case 3:
this.status = "欠款";
break;
+ case 4:
+ this.status = "已取消";
+ break;
default:
this.status = "";
break;
--
Gitblit v1.9.1