From f035172f0035ba68e79f61a989db829c7cfc9f72 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Sun, 14 Jan 2024 17:22:07 +0800
Subject: [PATCH] init

---
 .../java/com/ruoyi/cai/manager/ImService.java   |  9 ++++-----
 .../ruoyi/cai/service/UserMemberService.java    |  8 +++++++-
 .../cai/service/impl/UserMemberServiceImpl.java | 17 ++++++++++++++---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java
index b8ce4aad..44ecc239 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java
@@ -3,7 +3,6 @@ package com.ruoyi.cai.manager;
 import com.ruoyi.cai.domain.Account;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserChatRecord;
-import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.app.dto.ImMessageDTO;
 import com.ruoyi.cai.dto.app.vo.ImResp;
 import com.ruoyi.cai.enums.GenderEnum;
@@ -145,14 +144,14 @@ public class ImService {
     private UserBlacklistService userBlacklistService;
 
     private Long getByImPrice(Long userId){
-        UserMember userMember = userMemberService.getNormalMember(userId);
-        if(userMember == null){
+        UserMemberTypeEnum userMemberType = userMemberService.checkUserMember(userId);
+        if(userMemberType == null){
             return 10L;
         }
-        if(userMember.getMemberType().equals(UserMemberTypeEnum.NORMAL_VIP.getCode())){
+        if(userMemberType == UserMemberTypeEnum.NORMAL_VIP){
             return 5L;
         }
-        if(userMember.getMemberType().equals(UserMemberTypeEnum.SUPER_VIP.getCode())){
+        if(userMemberType  == UserMemberTypeEnum.SUPER_VIP){
             return 0L;
         }
         return 10L;
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
index d4889ee3..f84acd74 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
 import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
+import com.ruoyi.cai.enums.UserMemberTypeEnum;
 import com.ruoyi.common.core.domain.PageQuery;
 
 /**
@@ -21,7 +22,12 @@ public interface UserMemberService extends IService<UserMember> {
 
     UserMember getByUserIdAndType(Long userId, Integer type);
 
-    UserMember getNormalMember(Long userId);
+    /**
+     * 判断用户是否为会员
+     * @param userId
+     * @return
+     */
+    UserMemberTypeEnum checkUserMember(Long userId);
 
     void relieveMember(Long id);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
index d2662d6b..3a585dbb 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
@@ -9,6 +9,7 @@ import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
 import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
+import com.ruoyi.cai.enums.UserMemberTypeEnum;
 import com.ruoyi.cai.mapper.UserMemberMapper;
 import com.ruoyi.cai.pay.MemberStatusEnum;
 import com.ruoyi.cai.service.MemberPriceService;
@@ -59,10 +60,20 @@ public class UserMemberServiceImpl extends ServiceImpl<UserMemberMapper, UserMem
     }
 
     @Override
-    public UserMember getNormalMember(Long userId){
-        return this.getOne(Wrappers.lambdaQuery(UserMember.class).eq(UserMember::getUserId,userId)
+    public UserMemberTypeEnum checkUserMember(Long userId){
+        List<UserMember> list = this.list(Wrappers.lambdaQuery(UserMember.class)
+                .eq(UserMember::getUserId, userId)
                 .eq(UserMember::getMemberStatus, MemberStatusEnum.NORMAL.getCode())
-                .last("limit 1"));
+                .le(UserMember::getExpireDate, LocalDateTime.now())
+                .orderByDesc(UserMember::getMemberType));
+        for (UserMember userMember : list) {
+            if(userMember.getMemberType().equals(UserMemberTypeEnum.SUPER_VIP.getCode())){
+                return UserMemberTypeEnum.SUPER_VIP;
+            }else{
+                return UserMemberTypeEnum.NORMAL_VIP;
+            }
+        }
+        return null;
     }
 
     @Override