用户信息返回存量最高职级

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/user/UserInfoVO.java

@@ -89,6 +89,11 @@ public class UserInfoVO implements Serializable {
     @Schema(description = "用户等级")
     private Integer userLevel;
 
+    /**
+     * 用户存量职级
+     */
+    private Integer userRealLevel;
+
     /**
      * 盟主类型 小盟主=1 大盟主=2
      */

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserMapper.java

@@ -48,5 +48,13 @@ public interface KxsUserMapper extends BaseMapper<KxsUser> {
      * @return 创客列表
      */
     Page<UserMyUserListVO> myUserList(Page<KxsUser> page, @Param("param") UserMyUserListDTO param);
+
+    /**
+     * 存量预设职级
+     *
+     * @param userId 用户 ID
+     * @return {@link Integer}
+     */
+    Integer selectMaxBeforeLevel(@Param("userId") Long userId);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -422,9 +422,12 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         if(partner != null){
             userInfoVO.setPartnerType(partner.getPartnerType());
         }
-
+        //用户预设职级
         Integer level = baseMapper.selectMaxLevel(SecurityUtils.getUser().getId());
         userInfoVO.setUserLevel(level);
+        //用户真实和存量预设职级最大值
+        Integer realLevel = baseMapper.selectMaxBeforeLevel(SecurityUtils.getUser().getId());
+        userInfoVO.setUserRealLevel(realLevel);
         return userInfoVO;
     }
 

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserMapper.xml

@@ -47,6 +47,12 @@
         where a.id = #{userId}
 
     </select>
+    <select id="selectMaxBeforeLevel" resultType="java.lang.Integer">
+        select GREATEST(IFNULL(a.user_level, 0), IFNULL(preset.preset_level, 0))
+        from kxs_user a
+                 left join kxs_user_preset_before preset on a.id = preset.user_id and preset.end_time > now()
+        where a.id = #{userId}
+    </select>
     <select id="getParenUser" resultType="com.kxs.user.api.model.KxsUser">
         select
             *
@@ -99,5 +105,6 @@
         </if>
     </select>
 
+
 </mapper>