Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -53,6 +53,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Autowired
     private RedisUtils redisUtils;
 
+    private static final String INVITE_CODE = "1";
+
     @Override
     public User getById(String userId) {
         return usersMapper.getByUserId(userId);
@@ -60,14 +62,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
     /**
      * 获取登录用户
+     *
      * @param token
      */
     @Override
     public UsersDto getLoginUser(String token) {
         UsersDto usersDto = null;
-        String key = RedisKeyUtils.formatKeyWithPrefix(Constants.Redis.PREFIX_TOKEN,token);
+        String key = RedisKeyUtils.formatKeyWithPrefix(Constants.Redis.PREFIX_TOKEN, token);
         String value = redisUtils.getValue(key);
-        if(!StringUtils.isBlank(value)){
+        if (!StringUtils.isBlank(value)) {
             usersDto = JSONObject.parseObject(value, UsersDto.class);
             log.info("获取到用户登录信息users:{}", value);
         }
@@ -122,15 +125,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         /**
          * 判断用户推荐人的邀请码是否为空，空的话填写1   || "" == beInvitedCode
          */
-        if ("".equals(beInvitedCode)  || null==beInvitedCode) {
+        if ("".equals(beInvitedCode) || null == beInvitedCode) {
 
 
             //插入用户手机号与推荐人邀请码
-            String inviteCode="0";
+            String inviteCode = "0";
             beInvitedCode = "1";
-            int userLevel=0;
-            String headImage= Constants.Common.HEAD_POTRAIT;
-            usersMapper.insertbyint(userId, inviteCode,beInvitedCode,userLevel,headImage);
+            int userLevel = 0;
+            String headImage = Constants.Common.HEAD_POTRAIT;
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage);
             registUserMoudleInit(userId);
         } else {
             //用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
@@ -142,14 +145,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
             String idb = String.valueOf(usersMapper.beInvitedCode1(beInvitedCode));
             //判断是否存在被邀请人的用户
-            if(null==usersMapper.beInvitedCode1(beInvitedCode)){
+            if (null == usersMapper.beInvitedCode1(beInvitedCode)) {
                 Map map = new HashMap();
                 R.error(1, "邀请码填写无效！邀请人不存在，请重新填写！");
                 map.put("code:", 1);
                 map.put("msg:", "邀请码填写无效！邀请人不存在，请重新填写！");
                 return map;
             }
-            int idbc=Integer.valueOf(idb);
+            int idbc = Integer.valueOf(idb);
             int ida = user.getId();
             //判断被邀请用户的创建时间是否比推荐人的用户时间晚
             if (idbc > ida) {
@@ -184,20 +187,20 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             Map map = new HashMap();
             map.put("code", 0);
             map.put("msg", "注册成功！");
-            String key= StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX,Constants.RedisKey.SMS_PRIFIX,userId,"0"+"");
+            String key = StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX, Constants.RedisKey.SMS_PRIFIX, userId, "0" + "");
             redisUtils.delete(key);
             return map;
         }
 
         //根据当前推荐人的邀请码查询 上级用户id
         String userIdByIntive = usersMapper.getUserByIntiveCode(beInvitedCode);
-        if (null == userIdByIntive){
-            R.error(1,"用户推荐人邀请码不存在，请填写正确的邀请码");
-        }else{
+        if (null == userIdByIntive) {
+            R.error(1, "用户推荐人邀请码不存在，请填写正确的邀请码");
+        } else {
             //上级用户的直推信息 普通用户数量+1
             RecommendUser recommendUserMapperByUserId = recommendUserMapper.getByUserId(userIdByIntive);
             Integer normalUserNum = recommendUserMapperByUserId.getNormalUserNum();
-            recommendUserMapperByUserId.setNormalUserNum(normalUserNum+1);
+            recommendUserMapperByUserId.setNormalUserNum(normalUserNum + 1);
             recommendUserMapper.updateById(recommendUserMapperByUserId);
         }
 
@@ -277,6 +280,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("用户信息不存在!");
         }
 
+        //判断用户是否有邀请码 1：无
+        if (!INVITE_CODE.equals(user.getInviteCode())) {
+            return R.error("尊敬的用户您好，您的邀请码已存在，不能修改!");
+        }
+
         //2、根据邀请码，获取邀请人信息
         User userCode = usersMapper.queryByInviteCode(inviteCode);
         if (null == userCode) {
@@ -312,14 +320,16 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         String teamUserBeInvitedCode = teamUser.getBeInvitedCode();
         //递归实现上级所有的用户普通数量 + 1
         //若团队用户的被邀请码为 1 时 则没有上级用户用户
-        if ("1".equals(teamUserBeInvitedCode)){
+        if ("1".equals(teamUserBeInvitedCode)) {
             teamUserInfo(teamUserBeInvitedCode);
-        }else {
+        } else {
             return;
         }
     }
+
     /**
      * 用户登出
+     *
      * @param token
      * @return
      */
@@ -328,7 +338,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         int succ = 0;
 //        String key = RedisKeyUtils.formatKeyWithPrefix(token);
         redisUtils.delete(token);
-        if(redisUtils.getValue(token) == null){
+        if (redisUtils.getValue(token) == null) {
             succ = 1;
         }
         return succ;
@@ -336,12 +346,13 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
     /**
      * 注册时用户初始化
+     *
      * @param userId
      * @return
      */
     @Override
     @Transactional
-    public Boolean registUserMoudleInit(String userId){
+    public Boolean registUserMoudleInit(String userId) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         String data = sdf.format(new Date());
 
@@ -405,7 +416,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             teamPerformance.setMonthTeamPerformance(new BigDecimal(0));
             teamPerformanceMapper.add(teamPerformance);
             return true;
-        }catch (Exception e){
+        } catch (Exception e) {
             return false;
         }
     }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -170,9 +170,4 @@ public class UserController extends BaseController {
         return userService.fillInInviteCode(userId, inviteCode);
     }
 
-//    @GetMapping("/registUser")
-//    public void registUserInit(String userId){
-//        userService.registUserMoudleInit(userId);
-//    }
-
 }