From 9dfaf53ea5e70c839a157fd6cc0abfc0da804fb1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 16:32:28 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java | 11 +++++++++++
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java | 4 ++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
index 64ba519..b8e3727 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -113,6 +113,10 @@
if(ObjectUtil.isNotEmpty(orderListDto.getEndTimeVo())){
sysOrder.setEndTimeVo(orderListDto.getEndTimeVo());
}
+
+ if(ObjectUtil.isNotEmpty(orderListDto.getVipId())){
+ sysOrder.setVipId(orderListDto.getVipId());
+ }
if(StrUtil.isNotEmpty(orderListDto.getQueryKey())){
sysOrder.setKeyWordVo(orderListDto.getQueryKey());
}
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 c1e850f..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,6 +14,17 @@
@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;
--
Gitblit v1.9.1