From 2e49b9b9714e39a1b4941c69ba1671362ddfb50a Mon Sep 17 00:00:00 2001
From: xwb <717567226@qq.com>
Date: Wed, 29 Apr 2020 10:59:30 +0800
Subject: [PATCH] =?UTF-8?q?#I1EVJW=20=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A?=
 =?UTF-8?q?=E9=9D=92=E9=93=9C=E4=BC=9A=E5=91=98=E4=BB=BB=E5=8A=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=EF=BC=8C=E4=BB=8D=E6=97=A0=E6=B3=95=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/service/YxUserLevelService.java     |  2 +-
 .../service/impl/YxSystemUserLevelServiceImpl.java   |  2 +-
 .../user/service/impl/YxUserLevelServiceImpl.java    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java
index 8af9fa0d..48a569af 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/YxUserLevelService.java
@@ -33,7 +33,7 @@ public interface YxUserLevelService extends BaseService<YxUserLevel> {
 
     UserLevelInfoDTO getUserLevelInfo(int id);
 
-    int getUserLevel(int uid,int grade);
+    YxUserLevel getUserLevel(int uid,int grade);
 
     /**
      * 根据ID获取查询对象
diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java
index b216850b..ae9d9fae 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java
@@ -133,7 +133,7 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl<YxSystemUserLe
      */
     @Override
     public UserLevelDTO getLevelInfo(int uid,boolean isTask) {
-        int id = userLevelService.getUserLevel(uid,0); //用户当前等级id
+        int id = userLevelService.getUserLevel(uid,0).getId(); //用户当前等级id
         UserLevelInfoDTO userLevelInfoDTO = null;
         if(id > 0) userLevelInfoDTO = userLevelService.getUserLevelInfo(id);
         int levelId = 0;
diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
index 874a2c5b..7b902b97 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java
@@ -119,7 +119,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
         YxUserQueryVo userQueryVo =  userService.getYxUserById(uid);
         if(ObjectUtil.isNull(userQueryVo)) return false;
 
-        int levelId = getUserLevel(uid,9);
+        int levelId = getUserLevel(uid,9).getLevelId();
 
         int nextLevelId = systemUserLevelService.getNextLevelId(levelId);
         if(nextLevelId == 0) return false;
@@ -152,14 +152,14 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
      * @return
      */
     @Override
-    public int getUserLevel(int uid, int grade) {
+    public YxUserLevel getUserLevel(int uid, int grade) {
         QueryWrapper<YxUserLevel> wrapper = new QueryWrapper<>();
         wrapper.eq("is_del",0).eq("status",1)
                 .eq("uid",uid).orderByDesc("grade");
         if(grade > 0) wrapper.lt("grade",grade);
-        YxUserLevel userLevel = yxUserLevelMapper.selectOne(wrapper);
-        if(ObjectUtil.isNull(userLevel)) return 0;
-        if(userLevel.getIsForever() == 1) return userLevel.getId();
+        YxUserLevel userLevel = this.getOne(wrapper,false);
+        if(ObjectUtil.isNull(userLevel)) return new YxUserLevel();
+        if(userLevel.getIsForever() == 1) return userLevel;
         int nowTime = OrderUtil.getSecondTimestampTwo();
         if(nowTime > userLevel.getValidTime()){
             if(userLevel.getStatus() == 1){
@@ -169,7 +169,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
 
             return getUserLevel(uid,userLevel.getGrade());
         }
-        return userLevel.getId();
+        return userLevel;
     }
 
     @Override