用户端登录注册页面重构，拆分登录和注册接口。BUG987

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserVo.java

@@ -59,4 +59,7 @@ public class LifeUserVo extends LifeUser {
 
     @ApiModelProperty(value = "简介")
     private String blurb;
+
+    @ApiModelProperty(value = "注册标识 true.已注册 false.未注册")
+    private boolean registerFlag = true;
 }

alien-store/src/main/java/shop/alien/store/controller/LifeUserController.java

@@ -50,7 +50,22 @@ public class LifeUserController {
         log.info("LifeUserController.userLogin?phoneNum={}", phoneNum);
         LifeUserVo userVo = service.userLogin(phoneNum, inviteCode, macIp);
         if (null == userVo) {
-            return R.fail("登录失败");
+            return R.fail("账户不存在请先注册");
+        }
+        return R.data(userVo);
+    }
+
+    @ApiOperation("用户注册")
+    @ApiOperationSupport(order = 1)
+    @ApiImplicitParams({@ApiImplicitParam(name = "phoneNum", value = "手机号", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "inviteCode", value = "邀请码", dataType = "String", paramType = "query", required = false)})
+    @GetMapping("/userRegister")
+    public R<LifeUserVo> userRegister(@RequestParam("phoneNum") String phoneNum,  @RequestParam(required = false) String inviteCode,
+                                   @RequestParam(value = "macIp",required = false) String macIp) {
+        log.info("LifeUserController.userLogin?phoneNum={}", phoneNum);
+        LifeUserVo userVo = service.userRegister(phoneNum, inviteCode, macIp);
+        if (null == userVo ) {
+            return R.fail("注册失败请稍后再试");
         }
         return R.data(userVo);
     }

alien-store/src/main/java/shop/alien/store/service/LifeUserService.java

@@ -163,6 +163,32 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
 
     public LifeUserVo userLogin(String phoneNum, String inviteCode, String macIp) {
         LifeUser user = getUserByPhone(phoneNum);
+        if (user != null) {
+            LifeUserVo userVo = new LifeUserVo();
+            BeanUtils.copyProperties(user, userVo);
+            Map<String, String> tokenMap = new HashMap<>();
+            tokenMap.put("phone", phoneNum);
+            tokenMap.put("userName", user.getUserName());
+            tokenMap.put("userId", user.getId().toString());
+            tokenMap.put("userType", "user");
+            String token = getToken(phoneNum, user.getUserName(), tokenMap);
+            userVo.setToken(token);
+            baseRedisService.setString("user_" + phoneNum, token);
+            if (StringUtils.isNotEmpty(inviteCode)) {
+                // 生成邀请记录
+                activityInviteConfigService.bindInviteCode(user.getId(), inviteCode);
+            }
+            // 二手平台登录log，同一个macip登录多账号记录
+            addLifeUserLogInfo(user, macIp);
+            return userVo;
+        } else {
+            return null;
+        }
+    }
+
+    public LifeUserVo userRegister(String phoneNum, String inviteCode, String macIp) {
+        LifeUser user = getUserByPhone(phoneNum);
+        LifeUserVo userVo = new LifeUserVo();
         if (user == null) {
             LifeUser lifeUser = new LifeUser();
             lifeUser.setUserPhone(phoneNum);
@@ -172,7 +198,6 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
             int ret = lifeUserMapper.insert(lifeUser);
             if (ret == 1) {
                 LifeUser user2 = getUserByPhone(phoneNum);
-                LifeUserVo userVo = new LifeUserVo();
                 BeanUtils.copyProperties(user2, userVo);
                 Map<String, String> tokenMap = new HashMap<>();
                 tokenMap.put("phone", phoneNum);
@@ -182,41 +207,20 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
 //                userVo.setToken(JWTUtils1.createToken(tokenMap));
                 String token = getToken(phoneNum, userVo.getUserName(), tokenMap);
                 userVo.setToken(token);
+                userVo.setRegisterFlag(false);
                 baseRedisService.setString("user_" + phoneNum, token);
-
                 // 生成邀请记录
-                if(StringUtils.isNotEmpty(inviteCode)){
+                if (StringUtils.isNotEmpty(inviteCode)) {
                     activityInviteConfigService.bindInviteCode(lifeUser.getId(), inviteCode);
                 }
-
                 // 二手平台登录log，同一个macip登录多账号记录
                 addLifeUserLogInfo(user2, macIp);
-
                 return userVo;
             } else {
                 return null;
             }
-        } else {
-            LifeUserVo userVo = new LifeUserVo();
-            BeanUtils.copyProperties(user, userVo);
-            Map<String, String> tokenMap = new HashMap<>();
-            tokenMap.put("phone", phoneNum);
-            tokenMap.put("userName", user.getUserName());
-            tokenMap.put("userId", user.getId().toString());
-            tokenMap.put("userType", "user");
-            String token = getToken(phoneNum, user.getUserName(), tokenMap);
-            userVo.setToken(token);
-            baseRedisService.setString("user_" + phoneNum, token);
-            if(StringUtils.isNotEmpty(inviteCode)){
-                // 生成邀请记录
-                activityInviteConfigService.bindInviteCode(user.getId(), inviteCode);
-            }
-
-            // 二手平台登录log，同一个macip登录多账号记录
-            addLifeUserLogInfo(user, macIp);
-
-            return userVo;
         }
+        return userVo;
     }
 
     private String getToken(String phoneNum, String userVo, Map<String, String> tokenMap) {
@@ -290,19 +294,19 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
     }
 
     public boolean checkRealInfo(LifeUser user) {
-        LifeUser lifeUser =  lifeUserMapper.selectById(user.getId());
-        if(lifeUser != null) {
-          String realName = user.getRealName();
-          String idCard = user.getIdCard();
-          if ((realName == null && lifeUser.getRealName() == null)|| (idCard == null && lifeUser.getIdCard() == null)) {
-              return false;
-          }
-          return (StringUtils.isNotEmpty(realName) && !realName.equals(lifeUser.getRealName())) || (StringUtils.isNotEmpty(idCard) && !idCard.equals(lifeUser.getIdCard()));
+        LifeUser lifeUser = lifeUserMapper.selectById(user.getId());
+        if (lifeUser != null) {
+            String realName = user.getRealName();
+            String idCard = user.getIdCard();
+            if ((realName == null && lifeUser.getRealName() == null) || (idCard == null && lifeUser.getIdCard() == null)) {
+                return false;
+            }
+            return (StringUtils.isNotEmpty(realName) && !realName.equals(lifeUser.getRealName())) || (StringUtils.isNotEmpty(idCard) && !idCard.equals(lifeUser.getIdCard()));
         }
         return false;
     }
 
-    public void sendNotice(LifeUser user){
+    public void sendNotice(LifeUser user) {
         String receiverId = "user_" + user.getUserPhone();
         LifeNotice lifeNotice = new LifeNotice();
         lifeNotice.setReceiverId(receiverId);
@@ -335,25 +339,25 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
     public R havePayPassword(String userId, String password) {
         LifeUser lifeUser = lifeUserMapper.selectById(userId);
         HashMap<Object, Object> returnMap = new HashMap<>();
-        returnMap.put("code",200);
+        returnMap.put("code", 200);
         if (null == lifeUser) {
-            returnMap.put("message","未查询到用户");
-            returnMap.put("data","false");
+            returnMap.put("message", "未查询到用户");
+            returnMap.put("data", "false");
             return R.data(returnMap);
         }
-        if( null == lifeUser.getPayPassword()){
-            returnMap.put("message","用户未设置支付密码");
-            returnMap.put("data","false");
+        if (null == lifeUser.getPayPassword()) {
+            returnMap.put("message", "用户未设置支付密码");
+            returnMap.put("data", "false");
             return R.data(returnMap);
-        } else if(null != password){
-            if( !password.equals(lifeUser.getPayPassword())){
-                returnMap.put("message","密码错误");
-                returnMap.put("data","false");
+        } else if (null != password) {
+            if (!password.equals(lifeUser.getPayPassword())) {
+                returnMap.put("message", "密码错误");
+                returnMap.put("data", "false");
                 return R.data(returnMap);
             }
         }
-        returnMap.put("data","true");
-        returnMap.put("message","用户已设置支付密码");
+        returnMap.put("data", "true");
+        returnMap.put("message", "用户已设置支付密码");
         return R.data(returnMap);
     }