From 314a112bae2de97c7df7dde5b3920b738ae214a4 Mon Sep 17 00:00:00 2001
From: chuzhichao <czc15706259078@163.com>
Date: Mon, 26 Jun 2023 17:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cyl/ums/pojo/query/MemberQuery.java   |  5 +-
 .../com/cyl/ums/service/MemberService.java    | 56 ++-----------------
 2 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java
index 7bcce38..9208f8e 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java
@@ -16,7 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
 @Data
 public class MemberQuery {
     @ApiModelProperty("昵称 精确匹配")
-    private String nicknameLike;
+    private String nickname;
 
     @ApiModelProperty("密码 精确匹配")
     private String password;
@@ -60,4 +60,7 @@ public class MemberQuery {
     @ApiModelProperty("用户剩余积分 精确匹配")
     private BigDecimal integral;
 
+    private String beginTime;
+
+    private String endTime;
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java
index 096011a..6a89bc7 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java
@@ -50,65 +50,17 @@ public class MemberService {
             PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<Member> qw = new QueryWrapper<>();
-        String nicknameLike = query.getNicknameLike();
+        String nicknameLike = query.getNickname();
         if (!StringUtils.isEmpty(nicknameLike)) {
             qw.like("nickname", nicknameLike);
         }
-        String password = query.getPassword();
-        if (!StringUtils.isEmpty(password)) {
-            qw.eq("password", password);
-        }
         String phone = query.getPhone();
         if (!StringUtils.isEmpty(phone)) {
             qw.eq("phone", phone);
         }
-        String mark = query.getMark();
-        if (!StringUtils.isEmpty(mark)) {
-            qw.eq("mark", mark);
-        }
-        Integer status = query.getStatus();
-        if (status != null) {
-            qw.eq("status", status);
-        }
-        String avatar = query.getAvatar();
-        if (!StringUtils.isEmpty(avatar)) {
-            qw.eq("avatar", avatar);
-        }
-        Integer gender = query.getGender();
-        if (gender != null) {
-            qw.eq("gender", gender);
-        }
-        String city = query.getCity();
-        if (!StringUtils.isEmpty(city)) {
-            qw.eq("city", city);
-        }
-        String province = query.getProvince();
-        if (!StringUtils.isEmpty(province)) {
-            qw.eq("province", province);
-        }
-        String country = query.getCountry();
-        if (!StringUtils.isEmpty(country)) {
-            qw.eq("country", country);
-        }
-        LocalDate birthday = query.getBirthday();
-        if (birthday != null) {
-            qw.eq("birthday", birthday);
-        }
-        Long spreadUid = query.getSpreadUid();
-        if (spreadUid != null) {
-            qw.eq("spread_uid", spreadUid);
-        }
-        LocalDateTime spreadTime = query.getSpreadTime();
-        if (spreadTime != null) {
-            qw.eq("spread_time", spreadTime);
-        }
-        Integer level = query.getLevel();
-        if (level != null) {
-            qw.eq("level", level);
-        }
-        BigDecimal integral = query.getIntegral();
-        if (integral != null) {
-            qw.eq("integral", integral);
+        if (!StringUtils.isEmpty(query.getBeginTime()) && !StringUtils.isEmpty(query.getEndTime())){
+            qw.ge("create_time", query.getBeginTime());
+            qw.lt("create_time", query.getEndTime());
         }
         return memberMapper.selectList(qw);
     }