From f2b9a83f75a4345cd42d008f3153c18f8f890cad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Sep 2022 13:54:17 +0800
Subject: [PATCH] fix:退款订单退业绩是订单状态的判断
---
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 64fb66e..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
@@ -14,14 +14,25 @@
@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;
@ApiModelProperty(value = "查询字段")
private String queryKey;
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-// private Date orderTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date orderTime;
public Date getBeginTimeVo() {
return beginTimeVo;
@@ -51,13 +62,13 @@
@ApiModelProperty(hidden = true)
private Long companyId;
-// public Date getOrderTime() {
-// return orderTime;
-// }
-//
-// public void setOrderTime(Date orderTime) {
-// this.orderTime = orderTime;
-// }
+ public Date getOrderTime() {
+ return orderTime;
+ }
+
+ public void setOrderTime(Date orderTime) {
+ this.orderTime = orderTime;
+ }
public Long getCompanyId() {
return companyId;
--
Gitblit v1.9.1