企业注册修改3

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -54,7 +54,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, String remoteHost) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
-    /*    String phone = paramsMap.get("phone");
+        String phone = paramsMap.get("phone");
         String code = paramsMap.get("code");
         //是否存在
         Boolean aBoolean = redisTemplate.hasKey("xumu:" + phone);
@@ -65,9 +65,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String s = redisTemplate.opsForValue().get("xumu:" + phone);
         if (!code.equals(s)) {
             return new Result(10001, "验证码错误！！", false);
-        } else {*/
+        } else {
             System.out.println("登录成功");
-             String phone = paramsMap.get("phone");
+
             QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone", phone);
             SysUser sysUser = userMapper.selectOne(queryWrapper);
@@ -77,17 +77,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (sysUser.getAccoutType() == 1) {
                     this.updateById(sysUser.setLastIp(remoteHost));
                     return new Result(ResultCode.SUCCESS, sysUser);
-                } if (sysUser.getAccoutType() == 0){
+                }
+                if (sysUser.getAccoutType() == 0) {
                     return new Result(10002, "该账号未审核！", false);
-                }if (sysUser.getAccoutType() == 2){
+                }
+                if (sysUser.getAccoutType() == 2) {
                     return new Result(10002, "该账号已停用！", false);
                 }
-                if (sysUser.getAccoutType() == 3){
+                if (sysUser.getAccoutType() == 3) {
                     return new Result(10002, "该账号已注销！", false);
                 } else {
                     return new Result(10002, "该账号审核未通过！", false);
                 }
             }
+        }
 
     }
 
@@ -244,7 +247,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setNameTwo(paramsMap.get("nameTwo"));
             user.setFarmName(paramsMap.get("farmName"));
             QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("phone",TokenSign.getPhone(httpServletRequest));
+            queryWrapper.eq("phone", TokenSign.getPhone(httpServletRequest));
             Integer integer = userMapper.selectCount(queryWrapper);
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("user_name", paramsMap.get("userName"));
@@ -256,7 +259,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 } else {
                     return new Result(10001, "该手机号已被其他用户使用！", false);
                 }
-            }else{
+            } else {
                 return new Result(10001, "该企业已存在，请重新注册！", false);
             }
         }
@@ -310,10 +313,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
-            if (ObjectUtil.isNotEmpty(sysUser) ) {
-                if (sysUser.getIsRealName() == 1){
+            if (ObjectUtil.isNotEmpty(sysUser)) {
+                if (sysUser.getIsRealName() == 1) {
                     return new Result(10001, "用户已存在", false);
-                }else {
+                } else {
                     sysUser.setUserType(Integer.parseInt(paramsMap.get("type")));
                     sysUser.setUserName(paramsMap.get("userName"));
                     sysUser.setIdCard(paramsMap.get("idCord"));
@@ -340,10 +343,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     sysUser.setFarmName(paramsMap.get("farmName"));
                     sysUser.setAccoutType(1);
                     userMapper.updateById(sysUser);
-                    return new Result(ResultCode.SUCCESS,sysUser);
+                    return new Result(ResultCode.SUCCESS, sysUser);
                 }
 
-            }else {
+            } else {
                 if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
                     return new Result(10001, "实名手机号与当前手机号不一致", false);
                 }
@@ -420,7 +423,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (type == null || type == "") {
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type",  1, 4);
+                queryWrapper.in("user_type", 1, 4);
             } else {
                 queryWrapper.eq("user_type", role);
             }
@@ -431,7 +434,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type) == 1) { //待审核
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type",  1, 4);
+                queryWrapper.in("user_type", 1, 4);
             } else {
                 queryWrapper.eq("user_type", role);
             }
@@ -443,7 +446,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     .or().like(StringUtils.isNotBlank(word), "id_card", word);
         } else {
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type",  1, 4);
+                queryWrapper.in("user_type", 1, 4);
             } else {
                 queryWrapper.eq("user_type", role);
             }
@@ -609,7 +612,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     .like(StringUtils.isNotBlank(code), "detailed_adress_code", code);
         } else {
             queryWrapper.eq("user_type", 3)
-                    .like(StringUtils.isNotBlank(code),"detailed_adress_code", sysUser.getBriefAddressCode());
+                    .like(StringUtils.isNotBlank(code), "detailed_adress_code", sysUser.getBriefAddressCode());
         }
         Page<SysUser> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<SysUser> sysUsers = this.page(page, queryWrapper);
@@ -630,21 +633,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(code), "brief_address_code", code).eq("user_type", 2)
-                .like(StringUtils.isNotBlank(name),"user_name", name).ge("id",5);
+                .like(StringUtils.isNotBlank(name), "user_name", name).ge("id", 5);
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,userMapper.selectPage(page,queryWrapper));
+        return new Result(ResultCode.SUCCESS, userMapper.selectPage(page, queryWrapper));
     }
 
     @Override
     public Result listSeller() {
         List<SysUser> seller = this.list(new QueryWrapper<SysUser>().in("user_type", 2, 3).eq("is_real_name", 1));
-        return new Result(ResultCode.SUCCESS,seller);
+        return new Result(ResultCode.SUCCESS, seller);
     }
 
     @Override
     public Result listBuyer() {
         List<SysUser> buyer = this.list(new QueryWrapper<SysUser>().in("user_type", 3).eq("is_real_name", 1));
-        return new Result(ResultCode.SUCCESS,buyer);
+        return new Result(ResultCode.SUCCESS, buyer);
     }
 
 }