内容库V1.0.0

src/main/java/com/caimei365/user/controller/BaseApi.java

@@ -1,6 +1,5 @@
 package com.caimei365.user.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.caimei365.user.components.WeChatService;
 import com.caimei365.user.idempotent.IpSave;
@@ -9,19 +8,17 @@ import com.caimei365.user.model.dto.MobileDto;
 import com.caimei365.user.model.dto.PasswordDto;
 import com.caimei365.user.model.po.CmUser;
 import com.caimei365.user.model.po.SysDict;
-import com.caimei365.user.model.vo.SysDictVO;
 import com.caimei365.user.service.BaseService;
 import com.caimei365.user.service.SysDictService;
-import com.caimei365.user.utils.RequestUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -288,4 +285,10 @@ public class BaseApi {
     public Integer getByUserCount(CmUser user) {
         return baseService.getByUserCount(user);
     }
+
+    @ApiOperation("获取userId身份")
+    @GetMapping("/getUserType")
+    public int getUserType(String userId) {
+        return baseService.getUserType(userId);
+    }
 }

src/main/java/com/caimei365/user/mapper/BaseMapper.java

@@ -214,6 +214,8 @@ public interface BaseMapper {
      */
     public int updateClubStatus(Integer userId,Integer status);
 
+    public int getUserType(String userId);
+
     /**
      * 用户信息
      *

src/main/java/com/caimei365/user/service/BaseService.java

@@ -5,7 +5,6 @@ import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.dto.MobileDto;
 import com.caimei365.user.model.dto.PasswordDto;
 import com.caimei365.user.model.po.CmUser;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -144,5 +143,6 @@ public interface BaseService {
 
     CmUser getByUser(CmUser user);
 
+    int getUserType(String userId);
     CmUser findUserByMobile(String mobile, Integer oldUserId, Integer userIdentity);
 }

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.caimei365.user.service.impl;
 
-import com.aliyun.oss.internal.OSSUtils;
 import com.aliyuncs.exceptions.ClientException;
 import com.caimei365.user.components.CommonService;
 import com.caimei365.user.components.RedisService;
@@ -25,14 +24,15 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -842,4 +842,8 @@ public class BaseServiceImpl implements BaseService {
     public CmUser findUserByMobile(String mobile, Integer oldUserId, Integer userIdentity) {
         return baseMapper.findUserByMobile(mobile, oldUserId, userIdentity);
     }
+    @Override
+    public int getUserType(String userId) {
+        return baseMapper.getUserType(userId);
+    }
 }

src/main/resources/mapper/BaseMapper.xml

@@ -652,17 +652,23 @@
             <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
             <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
             <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
         </where>
         group by user.userID
         order by user.loginTime desc
         limit 0,1
     </select>
-    <select id="findUserByMobile"  resultMap="UserResult">
+    <select id="getUserType" resultType="int">
+        select user.userIdentity
+        FROM user user
+        WHERE user.userId = #{userId}
+    </select>
+
+    <select id="findUserByMobile" resultMap="UserResult">
         <include refid="selectUserVo"/>
         FROM user user
         WHERE user.bindMobile=#{mobile}