代码结构调整

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

@@ -1,7 +1,7 @@
 package com.caimei365.user.controller;
 
 import com.caimei365.user.model.JsonModel;
-import com.caimei365.user.service.UserService;
+import com.caimei365.user.service.BaseService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,9 +18,9 @@ import java.util.Map;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user")
-public class BaseUserApi {
+public class BaseApi {
 
-    private final UserService userService;
+    private final BaseService baseService;
 
     /**
      * 获取图片验证码
@@ -31,7 +31,7 @@ public class BaseUserApi {
      */
     @GetMapping("/captcha")
     public JsonModel<Map<String, Object>> getCaptchaImage(Integer platformType) {
-        return userService.getCaptchaImage(platformType);
+        return baseService.getCaptchaImage(platformType);
     }
 
     /**
@@ -47,7 +47,7 @@ public class BaseUserApi {
      */
     @GetMapping("/sms/code")
     public JsonModel getSmsCode(String mobile, String activateCodeType, String imgCode, String token, Integer platformType) {
-        return userService.getSmsCode(mobile, activateCodeType, imgCode, token, platformType);
+        return baseService.getSmsCode(mobile, activateCodeType, imgCode, token, platformType);
     }
 
 

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

@@ -1,14 +1,8 @@
 package com.caimei365.user.controller;
 
-import com.caimei365.user.idempotent.Idempotent;
-import com.caimei365.user.model.JsonModel;
-import com.caimei365.user.model.UserPo;
-import com.caimei365.user.service.ClubService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
 
 
 /**
@@ -22,38 +16,5 @@ import org.springframework.web.server.ServerWebExchange;
 @RequestMapping("/user/club")
 public class ClubApi {
 
-    private final ClubService clubService;
-
-    /**
-     * 普通机构入驻(注册)
-     *
-     * spi旧接口：club/common
-     *
-     * @param source            注册来源: 0网站 1小程序
-     * @param userName          用户名
-     * @param bindMobile        企业绑定手机号
-     * @param password          密码
-     * @param passWordConfirm   用户确认密码
-     * @param smsCode           短信验证码(旧：activationCode)
-     * @param isAgreed          是否同意勾选同意协议，1是，其他否
-     * @param unionId           微信unionId
-     * @param nickName          微信昵称
-     * @param avatarUrl         微信头像(旧：headimgurl)
-     */
-    @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
-    @PostMapping("/register")
-    public JsonModel<UserPo> register(Integer source,
-                                      String userName,
-                                      String bindMobile,
-                                      String password,
-                                      String passWordConfirm,
-                                      String smsCode,
-                                      Integer isAgreed,
-                                      String unionId,
-                                      String nickName,
-                                      String avatarUrl,
-                                      ServerWebExchange serverWebExchange) {
-        return clubService.register(source, userName, bindMobile, password, passWordConfirm, smsCode, isAgreed, unionId, nickName, avatarUrl, serverWebExchange);
-    }
 
 }

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

@@ -1,11 +1,9 @@
 package com.caimei365.user.controller;
 
-import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.model.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -0,0 +1,57 @@
+package com.caimei365.user.controller;
+
+import com.caimei365.user.idempotent.Idempotent;
+import com.caimei365.user.model.JsonModel;
+import com.caimei365.user.model.UserPo;
+import com.caimei365.user.service.RegisterService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+
+/**
+ * 注册Api
+ *
+ * @author : Charles
+ * @date : 2021/3/10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/user/register")
+public class RegisterApi {
+    private final RegisterService registerService;
+
+    /**
+     * 普通机构入驻(注册)
+     *
+     * spi旧接口：club/common
+     *
+     * @param source            注册来源: 0网站 1小程序
+     * @param userName          用户名
+     * @param bindMobile        企业绑定手机号
+     * @param password          密码
+     * @param passWordConfirm   用户确认密码
+     * @param smsCode           短信验证码(旧：activationCode)
+     * @param isAgreed          是否同意勾选同意协议，1是，其他否
+     * @param unionId           微信unionId
+     * @param nickName          微信昵称
+     * @param avatarUrl         微信头像(旧：headimgurl)
+     */
+    @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
+    @PostMapping("/club")
+    public JsonModel<UserPo> clubRegister(Integer source,
+                                      String userName,
+                                      String bindMobile,
+                                      String password,
+                                      String passWordConfirm,
+                                      String smsCode,
+                                      Integer isAgreed,
+                                      String unionId,
+                                      String nickName,
+                                      String avatarUrl,
+                                      ServerWebExchange serverWebExchange) {
+        return registerService.clubRegister(source, userName, bindMobile, password, passWordConfirm, smsCode, isAgreed, unionId, nickName, avatarUrl, serverWebExchange);
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package com.caimei365.user.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/10
+ */
+@Mapper
+public interface BaseMapper {
+    /**
+     * 根据邮箱获取用户id
+     *
+     * @param email 邮箱
+     * @return userId
+     */
+    Integer getUserIdByEmail(String email);
+    /**
+     * 根据手机号获取用户Id
+     *
+     * @param mobile 手机号
+     * @return 用户Id
+     */
+    Integer getUserIdByMobile(String mobile);
+    /**
+     * 根据手机号获取运营人员Id
+     *
+     * @param mobile 手机号
+     * @return userId
+     */
+    Integer getOperationIdByMobile(String mobile);
+}

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

@@ -1,6 +1,5 @@
 package com.caimei365.user.mapper;
 
-import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.OperationPo;
 import com.caimei365.user.model.UserLoginVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,27 +13,13 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface LoginMapper {
-    /**
-     * 根据手机号获取用户id
-     *
-     * @param bindMobile 手机号
-     * @return userId
-     */
-    Integer getUserIdByMobile(String bindMobile);
-    /**
-     * 根据手机号获取运营人员id
-     *
-     * @param bindMobile 手机号
-     * @return userId
-     */
-    Integer getOperationIdByMobile(String bindMobile);
     /**
      * 根据手机号获取用户
      *
      * @param mobile 手机号
      * @return BaseUser
      */
-    BaseUser getBaseUserByMobile(@Param("mobile") String mobile);
+    //BaseUser getBaseUserByMobile(@Param("mobile") String mobile);
     /**
      * 根据用户id获取用户
      *
@@ -99,13 +84,7 @@ public interface LoginMapper {
     void updateOperationUnionId(@Param("userId") Integer userId, @Param("unionId") String unionId);
 
 
-    /**
-     * 根据邮箱获取用户id
-     *
-     * @param email 邮箱
-     * @return userId
-     */
-    Integer getUserIdByEmail(String email);
+
 
     /**
      * 根据openId获取用户Id

src/main/java/com/caimei365/user/mapper/RegisterUserDao.java → src/main/java/com/caimei365/user/mapper/RegisterMapper.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date : 2021/3/8
  */
 @Mapper
-public interface RegisterUserDao {
+public interface RegisterMapper {
     /**
      * 保存(机构)用户（user）
      * @param user

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

@@ -10,7 +10,7 @@ import java.util.Map;
  * @author : Charles
  * @date : 2021/3/4
  */
-public interface UserService {
+public interface BaseService {
     /**
      * 获取图片验证码
      *

src/main/java/com/caimei365/user/service/ClubService.java → src/main/java/com/caimei365/user/service/RegisterService.java

@@ -1,6 +1,5 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.model.UserPo;
 import org.springframework.web.server.ServerWebExchange;
@@ -11,7 +10,7 @@ import org.springframework.web.server.ServerWebExchange;
  * @author : Charles
  * @date : 2021/3/8
  */
-public interface ClubService {
+public interface RegisterService {
     /**
      * 普通机构入驻(注册)
      *
@@ -28,6 +27,6 @@ public interface ClubService {
      * @param serverWebExchange ServerWebExchange
      * @return BaseUser
      */
-    JsonModel<UserPo> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
+    JsonModel<UserPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
 
 }

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

@@ -1,6 +1,5 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -36,7 +35,7 @@ public interface ShopService {
      * @param serverWebExchange     ServerWebExchange(新参数)
      * @return BaseUser
      */
-    JsonModel<UserLoginVo> register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange);
+    JsonModel register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange);
 
     /**
      * 小程序端分步供应商注册
@@ -64,5 +63,5 @@ public interface ShopService {
      * @param whichStep             注册步数
      * @return BaseUser
      */
-    JsonModel<UserLoginVo> appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep);
+    JsonModel appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep);
 }

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

@@ -1,10 +1,9 @@
 package com.caimei365.user.service.impl;
 
-import com.caimei365.user.mapper.LoginMapper;
-import com.caimei365.user.model.BaseUser;
+import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.components.RedisService;
-import com.caimei365.user.service.UserService;
+import com.caimei365.user.service.BaseService;
 import com.caimei365.user.utils.AliyunSmsUtil;
 import com.caimei365.user.utils.CodeUtil;
 import com.caimei365.user.utils.ImageCaptchaUtil;
@@ -26,12 +25,12 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class UserServiceImpl implements UserService {
+public class BaseServiceImpl implements BaseService {
 
     @Resource
     private RedisService redisService;
     @Resource
-    private LoginMapper loginMapper;
+    private BaseMapper baseMapper;
 
     /**
      * 获取图片验证码
@@ -108,16 +107,16 @@ public class UserServiceImpl implements UserService {
             boolean sendFlag = false;
             // 生成六位验证码
             String randomCode = CodeUtil.generateCodeInt(6);
-            // 根据手机号查询用户
-            BaseUser baseUser = loginMapper.getBaseUserByMobile(mobile);
+            // 根据手机号查询用户Id
+            Integer userId = baseMapper.getUserIdByMobile(mobile);
             if ("1".equals(activateCodeType)) {
-                if (null == baseUser) {
+                if (null == userId || userId <= 0) {
                     return JsonModel.error("该手机号尚未注册");
                 }
-                // 修改密码
+                // 找回密码
                 sendFlag = AliyunSmsUtil.sendSms(mobile, 1, "{code:" + randomCode + "}");
             } else {
-                if (null != baseUser) {
+                if (userId > 0) {
                     return JsonModel.error("该手机号已被使用");
                 }
                 if ("2".equals(activateCodeType)) {

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java → src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -1,9 +1,10 @@
 package com.caimei365.user.service.impl;
 
+import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.LoginMapper;
-import com.caimei365.user.mapper.RegisterUserDao;
+import com.caimei365.user.mapper.RegisterMapper;
 import com.caimei365.user.model.*;
-import com.caimei365.user.service.ClubService;
+import com.caimei365.user.service.RegisterService;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.utils.AliyunSmsUtil;
 import com.caimei365.user.utils.Md5Util;
@@ -27,14 +28,14 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class ClubServiceImpl implements ClubService {
+public class RegisterServiceImpl implements RegisterService {
 
     @Resource
     private RedisService redisService;
     @Resource
-    private LoginMapper loginMapper;
+    private BaseMapper baseMapper;
     @Resource
-    private RegisterUserDao registerUserDao;
+    private RegisterMapper registerMapper;
 
     /**
      * 普通机构入驻(注册)
@@ -54,7 +55,7 @@ public class ClubServiceImpl implements ClubService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public JsonModel<UserPo> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
+    public JsonModel<UserPo> clubRegister(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
         // 打印IP
         String ip = RequestUtil.getIp(serverWebExchange);
         log.info("X-Forwarded-For:" + ip);
@@ -75,12 +76,12 @@ public class ClubServiceImpl implements ClubService {
             return JsonModel.error("请勾选同意协议", null);
         }
         // 查找用户表是否存在
-        Integer dbUserId = loginMapper.getUserIdByMobile(bindMobile);
+        Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
         if (dbUserId > 0) {
             return JsonModel.error("该手机号已被使用", null);
         }
         // 查找运营人员表是否存在
-        Integer dbOperationId = loginMapper.getOperationIdByMobile(bindMobile);
+        Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
         if (dbOperationId > 0) {
             return JsonModel.error("您已是机构运营人员，无需再注册机构", null);
         }
@@ -124,7 +125,7 @@ public class ClubServiceImpl implements ClubService {
         /*
             保存数据库 user
          */
-        int insertFlag = registerUserDao.insertClubUser(user);
+        int insertFlag = registerMapper.insertClubUser(user);
         if (insertFlag < 1) {
             throw new RuntimeException("插入数据库异常user:" + user.toString());
         }
@@ -151,13 +152,13 @@ public class ClubServiceImpl implements ClubService {
         /*
             保存数据库 club
          */
-        int insertClubFlag = registerUserDao.insertClub(club);
+        int insertClubFlag = registerMapper.insertClub(club);
         if (insertClubFlag < 1) {
             throw new RuntimeException("插入数据库异常club:" + club.toString());
         }
         // user更新clubId
         user.setClubId(club.getClubId());
-        registerUserDao.updateUserClubId(user.getUserId(), club.getClubId());
+        registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         // 注册成功短信
         boolean smsFlag = AliyunSmsUtil.sendSms(bindMobile, 7, "{name:"+ bindMobile +",password:"+ password +"}");
         if (!smsFlag) {
@@ -203,7 +204,7 @@ public class ClubServiceImpl implements ClubService {
             /*
                 保存数据库 operation
              */
-            int insertOperationFlag = registerUserDao.insertOperation(operation);
+            int insertOperationFlag = registerMapper.insertOperation(operation);
             if (insertOperationFlag < 1) {
                 log.info(operation.getUserId() + " 插入数据库异常operation:" + operation.toString());
             }

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

@@ -1,8 +1,9 @@
 package com.caimei365.user.service.impl;
 
 import com.caimei365.user.components.RedisService;
+import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.LoginMapper;
-import com.caimei365.user.mapper.RegisterUserDao;
+import com.caimei365.user.mapper.RegisterMapper;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.model.ShopPo;
 import com.caimei365.user.model.UserPo;
@@ -32,9 +33,9 @@ public class ShopServiceImpl implements ShopService {
     @Resource
     private RedisService redisService;
     @Resource
-    private LoginMapper loginMapper;
+    private BaseMapper baseMapper;
     @Resource
-    private RegisterUserDao registerUserDao;
+    private RegisterMapper registerMapper;
 
     /**
      * PC端供应商注册
@@ -83,12 +84,12 @@ public class ShopServiceImpl implements ShopService {
             return JsonModel.error("请勾选同意协议", null);
         }
         // 查找用户表是否存在
-        Integer dbUserId = loginMapper.getUserIdByMobile(bindMobile);
+        Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
         if (dbUserId > 0) {
             return JsonModel.error("该手机号已被使用", null);
         }
         // 查找运营人员表是否存在
-        Integer dbOperationId = loginMapper.getOperationIdByMobile(bindMobile);
+        Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
         if (dbOperationId > 0) {
             return JsonModel.error("您已是机构运营人员，无需再注册机构", null);
         }
@@ -97,7 +98,7 @@ public class ShopServiceImpl implements ShopService {
             return JsonModel.error("手机验证码错误", null);
         }
         if (StringUtils.isNotBlank(email)) {
-            dbUserId = loginMapper.getUserIdByEmail(email);
+            dbUserId = baseMapper.getUserIdByEmail(email);
             if (dbUserId > 0) {
                 return JsonModel.error("该邮箱已被使用", null);
             }
@@ -136,7 +137,7 @@ public class ShopServiceImpl implements ShopService {
         user.setValidFlag(1);
         // 同意协议
         user.setAgreeFlag(isAgreed);
-        registerUserDao.insertShopUser(user);
+        registerMapper.insertShopUser(user);
         /*
             组装供应商数据 shop
          */
@@ -182,14 +183,14 @@ public class ShopServiceImpl implements ShopService {
         /*
             保存数据库 shop
          */
-        int insertShopFlag = registerUserDao.insertShop(shop);
+        int insertShopFlag = registerMapper.insertShop(shop);
         if (insertShopFlag < 1) {
             log.info(shop.getUserId() + " 插入数据库异常shop:" + shop.toString());
             return JsonModel.error("插入数据库异常", null);
         }
         // user更新shopId
         user.setShopId(shop.getShopId());
-        registerUserDao.updateUserShopId(user.getUserId(), shop.getShopId());
+        registerMapper.updateUserShopId(user.getUserId(), shop.getShopId());
         log.info("注册供应商---------userID:" + user.getUserId());
         return JsonModel.success();
     }
@@ -233,12 +234,12 @@ public class ShopServiceImpl implements ShopService {
                 return JsonModel.error("两次输入的密码不一致");
             }
             // 查找用户表是否存在
-            Integer dbUserId = loginMapper.getUserIdByMobile(bindMobile);
+            Integer dbUserId = baseMapper.getUserIdByMobile(bindMobile);
             if (dbUserId > 0) {
                 return JsonModel.error("该手机号已被使用", null);
             }
             // 查找运营人员表是否存在
-            Integer dbOperationId = loginMapper.getOperationIdByMobile(bindMobile);
+            Integer dbOperationId = baseMapper.getOperationIdByMobile(bindMobile);
             if (dbOperationId > 0) {
                 return JsonModel.error("您已是机构运营人员，无需再注册机构", null);
             }
@@ -253,7 +254,7 @@ public class ShopServiceImpl implements ShopService {
             }
             if (StringUtils.isNotBlank(email)) {
                 // 查找用户表是否存在相同邮箱
-                Integer dbUserId = loginMapper.getUserIdByEmail(email);
+                Integer dbUserId = baseMapper.getUserIdByEmail(email);
                 if (dbUserId > 0) {
                     return JsonModel.error("该邮箱已被使用", null);
                 }

src/main/resources/mapper/BaseMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei365.user.mapper.BaseMapper">
+    <select id="getUserIdByEmail" resultType="java.lang.Integer">
+        select userID from user
+        where email = #{mobile} and userIdentity in (1,2,3,4)
+        limit 1
+    </select>
+    <select id="getUserIdByMobile" resultType="java.lang.Integer">
+        select userID from user u
+        left join cm_mall_operation_user cu on cu.userID = u.userID
+        where (u.bindMobile = #{mobile}
+                or (cu.mobile = #{mobile} and cu.delFlag != 1)
+        ) and u.userIdentity in (1,2,3,4)
+        limit 1
+    </select>
+    <select id="getOperationIdByMobile" resultType="java.lang.Integer">
+        select id from cm_mall_operation_user
+        where mobile = #{mobile} and delFlag = '0'
+        limit 1
+    </select>
+</mapper>

src/main/resources/mapper/LoginMapper.xml

@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.LoginMapper">
-    <select id="getUserIdByMobile" resultType="java.lang.Integer">
-        select userID from user
-        where bindMobile = #{mobile} and userIdentity in (1,2,3,4)
-        limit 1
-    </select>
-    <select id="getOperationIdByMobile" resultType="java.lang.Integer">
-        select id from cm_mall_operation_user
-        where mobile = #{mobile} and delFlag = '0'
-        limit 1
-    </select>
-    <select id="getBaseUserByMobile" resultType="com.caimei365.user.model.BaseUser">
+
+
+    <!--<select id="getBaseUserByMobile" resultType="com.caimei365.user.model.BaseUser">
         select u.userID as userId,
                u.userName as userName,
                u.mobile as mobile,
@@ -26,7 +18,7 @@
                 or (cu.mobile = #{mobile} and cu.delFlag != 1)
         ) and u.userIdentity in (1,2,3,4)
         limit 1
-    </select>
+    </select>-->
     <select id="getLoginUserByUserId" resultType="com.caimei365.user.model.UserLoginVo">
         select u.userID as userId,
                u.userName as userName,
@@ -153,12 +145,6 @@
         where userID = #{userId}
     </update>
 
-
-    <select id="getUserIdByEmail" resultType="java.lang.Integer">
-        select userID from user
-        where email = #{mobile} and userIdentity in (1,2,3,4)
-        limit 1
-    </select>
     <select id="getUserIdByOpenId" resultType="java.lang.Integer">
         select o.userID as userId
         from

src/main/resources/mapper/RegisterUserMapper.xml → src/main/resources/mapper/RegisterMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei365.user.mapper.RegisterUserDao">
+<mapper namespace="com.caimei365.user.mapper.RegisterMapper">
     <insert id="insertClubUser" parameterType="com.caimei365.user.model.UserPo" keyProperty="userId" useGeneratedKeys="true">
         insert into user(`registerTime`, `registerIP`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`,`userIdentity`, `userPermission`, `clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`)
                   values(#{registerTime},#{registerIp},#{source},#{registerUserTypeID},#{name},#{userName},#{bindMobile},#{userIdentity},#{userPermission},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus})