From b39f272593791e6ae59e871409a629e882027597 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Wed, 26 Jul 2023 15:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=99=BB=E5=BD=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyl/h5/controller/H5MemberController.java |  1 -
 .../ums/pojo/query/MemberLogininforQuery.java |  4 +++
 .../ums/service/MemberLogininforService.java  | 30 ++++++++++++-------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
index e3bbe96..46f17a6 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java
@@ -66,7 +66,6 @@ public class H5MemberController {
     }
 
     @ApiOperation("新增会员登录记录")
-    @Log(title = "会员登录记录", businessType = BusinessType.INSERT)
     @GetMapping("/record/login")
     public void add(HttpServletRequest request) {
         LoginMember loginMember = tokenService.getLoginMember(request);
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java
index 41b65e3..9578cab 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberLogininforQuery.java
@@ -34,4 +34,8 @@ public class MemberLogininforQuery {
     @ApiModelProperty("登陆时间 精确匹配")
     private LocalDateTime loginTime;
 
+    private String beginTime;
+
+    private String endTime;
+
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java
index e1c969a..a2dc475 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberLogininforService.java
@@ -4,16 +4,20 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cyl.manager.ums.domain.Member;
 import com.cyl.manager.ums.mapper.MemberMapper;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.core.domain.model.LoginMember;
+import com.ruoyi.common.utils.AesCryptoUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Pageable;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -35,6 +39,9 @@ public class MemberLogininforService {
     @Autowired
     private MemberMapper memberMapper;
 
+    @Value("${aes.key}")
+    private String aesKey;
+
     /**
      * 查询会员登录记录
      *
@@ -53,17 +60,20 @@ public class MemberLogininforService {
      * @return 会员登录记录
      */
     public List<MemberLogininfor> selectList(MemberLogininforQuery query, Pageable page) {
-        if (page != null) {
-            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
-        }
         QueryWrapper<MemberLogininfor> qw = new QueryWrapper<>();
         String phone = query.getPhone();
         if (!StringUtils.isEmpty(phone)) {
-            qw.eq("phone", phone);
+            LambdaQueryWrapper<Member> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(Member::getPhoneEncrypted, AesCryptoUtils.encrypt(aesKey, phone));
+            Member member = memberMapper.selectOne(wrapper);
+            if (member != null){
+                qw.eq("phone", member.getPhoneEncrypted());
+            }else {
+                qw.eq("phone", "-1");
+            }
         }
-        Long memberId = query.getMemberId();
-        if (memberId != null) {
-            qw.eq("member_id", memberId);
+        if (page != null) {
+            PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         String ipaddr = query.getIpaddr();
         if (!StringUtils.isEmpty(ipaddr)) {
@@ -81,9 +91,9 @@ public class MemberLogininforService {
         if (!StringUtils.isEmpty(os)) {
             qw.eq("os", os);
         }
-        LocalDateTime loginTime = query.getLoginTime();
-        if (loginTime != null) {
-            qw.eq("login_time", loginTime);
+        if (query.getBeginTime() != null && query.getEndTime() != null) {
+            qw.ge("login_time", query.getBeginTime());
+            qw.lt("login_time", query.getEndTime());
         }
         return memberLogininforMapper.selectList(qw);
     }