From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1

---
 zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
index ab8833d..1154bf5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
@@ -8,16 +8,61 @@
  * @date 2020-12-21
  **/
 @ApiModel(value = "VipInfoListDto", description = "获取会员列表参数类")
-public class VipInfoListDto {
+public class VipInfoListDto extends BasePageDto {
 
     @ApiModelProperty(value = "查询参数(客户姓名/手机/会员编号/拼音)", example = "")
     private String queryKey;
 
-    @ApiModelProperty(value = "排序字段")
-    private String order;
+    @ApiModelProperty(value = "排序 desc/asc", example = "asc")
+    private String order = "asc";
 
-    @ApiModelProperty(value = "排序 desc/asc")
-    private String sort;
+    @ApiModelProperty(value = "排序字段 monthArrived(本月到店次数) yearArrived(本年) used(消费) consume(消耗) vipLevel(会员等级) arriveTime(上次到店)", example = "zjm")
+    private String sort = "zjm";
+
+    @ApiModelProperty(value = "生日 1-三天内生日 2-本月生日 3-下月生日")
+    private String birthType;
+
+    @ApiModelProperty(value = "会员类型ID")
+    private Long vipType;
+
+    @ApiModelProperty(value = "其他 2-新客户 1-老客户")
+    private String other;
+
+    @ApiModelProperty(hidden = true)
+    private Long shopId;
+
+    @ApiModelProperty(hidden = true)
+    private Long companyId;
+
+    @ApiModelProperty(hidden = true)
+    private int offset;
+
+    @ApiModelProperty(hidden = true)
+    private int limit;
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public void setOffset(int offset) {
+        this.offset = offset;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
 
     public String getQueryKey() {
         return queryKey;
@@ -42,4 +87,36 @@
     public void setSort(String sort) {
         this.sort = sort;
     }
+
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getBirthType() {
+        return birthType;
+    }
+
+    public void setBirthType(String birthType) {
+        this.birthType = birthType;
+    }
+
+    public Long getVipType() {
+        return vipType;
+    }
+
+    public void setVipType(Long vipType) {
+        this.vipType = vipType;
+    }
+
+    public String getOther() {
+        return other;
+    }
+
+    public void setOther(String other) {
+        this.other = other;
+    }
 }

--
Gitblit v1.9.1