From 00ffec36ed525b9a71aa5c461b4e1c85a04a3a77 Mon Sep 17 00:00:00 2001
From: xwb <717567226@qq.com>
Date: Sun, 3 May 2020 19:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/YxSystemUserLevelServiceImpl.java   | 7 ++++++-
 .../modules/user/service/impl/YxUserLevelServiceImpl.java | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

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 ae9d9fae..8eeeb688 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
@@ -10,6 +10,7 @@ package co.yixiang.modules.user.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import co.yixiang.modules.user.entity.YxSystemUserLevel;
+import co.yixiang.modules.user.entity.YxUserLevel;
 import co.yixiang.modules.user.mapper.YxSystemUserLevelMapper;
 import co.yixiang.modules.user.mapping.SystemUserLevelMap;
 import co.yixiang.modules.user.service.YxSystemUserLevelService;
@@ -133,7 +134,11 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl<YxSystemUserLe
      */
     @Override
     public UserLevelDTO getLevelInfo(int uid,boolean isTask) {
-        int id = userLevelService.getUserLevel(uid,0).getId(); //用户当前等级id
+        int id = 0; //用户当前等级id
+        YxUserLevel userLevel = userLevelService.getUserLevel(uid, 0);
+        if(userLevel.getId()!=null){
+            userLevel.getId();
+        }
         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 7b902b97..d7c6de1e 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
@@ -118,9 +118,11 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl<YxUserLevelMapper, Y
     public boolean setLevelComplete(int uid) {
         YxUserQueryVo userQueryVo =  userService.getYxUserById(uid);
         if(ObjectUtil.isNull(userQueryVo)) return false;
-
-        int levelId = getUserLevel(uid,9).getLevelId();
-
+        int levelId = 0;
+        YxUserLevel yxUserLevel = getUserLevel(uid,9);
+        if(yxUserLevel.getId()!=null ){
+            levelId =  yxUserLevel.getLevelId();
+        }
         int nextLevelId = systemUserLevelService.getNextLevelId(levelId);
         if(nextLevelId == 0) return false;