资讯模块——邀请码过滤特殊字符功能功能修复

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -135,7 +133,7 @@ public interface UsersMapper extends BaseMapper<User> {
 
     Integer getById(@Param("userId") String userId);
 
-    Integer BYQMById(@Param("userId") String userId);
+    String BYQMById(@Param("userId") String userId);
 
     /**
      * 根据userid获取获取所有的直接推荐人

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -249,7 +249,7 @@
             user_id=#{userId}
         </where>
     </select>
-    <select id="BYQMById" resultType="java.lang.Integer">
+    <select id="BYQMById" resultType="String">
         select
         be_invited_code
         from

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

@@ -106,4 +106,120 @@ public class User  implements Serializable{
      */
     @ApiModelProperty(name = "updateTime", value = "修改时间")
     private Date updateTime;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getHeadImage() {
+        return headImage;
+    }
+
+    public void setHeadImage(String headImage) {
+        this.headImage = headImage;
+    }
+
+    public int getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(int userLevel) {
+        this.userLevel = userLevel;
+    }
+
+    public BigDecimal getCrossBorderLine() {
+        return crossBorderLine;
+    }
+
+    public void setCrossBorderLine(BigDecimal crossBorderLine) {
+        this.crossBorderLine = crossBorderLine;
+    }
+
+    public String getIdCardNumber() {
+        return idCardNumber;
+    }
+
+    public void setIdCardNumber(String idCardNumber) {
+        this.idCardNumber = idCardNumber;
+    }
+
+    public String getFansNickname() {
+        return fansNickname;
+    }
+
+    public void setFansNickname(String fansNickname) {
+        this.fansNickname = fansNickname;
+    }
+
+    public String getFansId() {
+        return fansId;
+    }
+
+    public void setFansId(String fansId) {
+        this.fansId = fansId;
+    }
+
+    public String getInviteCode() {
+        return inviteCode;
+    }
+
+    public void setInviteCode(String inviteCode) {
+        this.inviteCode = inviteCode;
+    }
+
+    public String getBeInvitedCode() {
+        return beInvitedCode;
+    }
+
+    public void setBeInvitedCode(String beInvitedCode) {
+        this.beInvitedCode = beInvitedCode;
+    }
+
+    public String getCustomerServiceId() {
+        return customerServiceId;
+    }
+
+    public void setCustomerServiceId(String customerServiceId) {
+        this.customerServiceId = customerServiceId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -126,8 +126,16 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             int userLevel = 0;
             String headImage = Constants.Common.HEAD_POTRAIT;
             usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage);
+            //初始化六张表
             registUserMoudleInit.registUserMoudleInit(userId);
         } else {
+            //插入用户手机号与推荐人邀请码
+            String inviteCode = "0";
+            int userLevel = 0;
+            String headImage = Constants.Common.HEAD_POTRAIT;
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage);
+            //初始化六张表
+            registUserMoudleInit.registUserMoudleInit(userId);
             //用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
             User user = usersMapper.getByBeInvitedCode(beInvitedCode);
 
@@ -138,17 +146,22 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             String idb = String.valueOf(usersMapper.beInvitedCode1(beInvitedCode));
 
             //判断是否存在被邀请人的用户
-            if (null == usersMapper.beInvitedCode1(beInvitedCode)) {
+            if (null == idb) {
                 Map map = new HashMap();
                 R.error(1, "邀请码填写无效！邀请人不存在，请重新填写！");
                 map.put("code:", 1);
                 map.put("msg:", "邀请码填写无效！邀请人不存在，请重新填写！");
                 return map;
             }
+            //推荐人的id
             int idbc = Integer.valueOf(idb);
-            int ida = user.getId();
+
+            //获取注册用户的id
+            User use=  usersMapper.getByUserId(userId);
+            int ida =use.getId();
+
             //判断被邀请用户的创建时间是否比推荐人的用户时间晚
-            if (idbc < ida) {
+            if (idbc > ida) {
                 Map map = new HashMap();
                 R.error(1, "注册失败！邀请码无效,请重新填写！");
                 map.put("code:", 1);
@@ -162,7 +175,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         }
 
         //根据插入的用户手机号，查询用户唯一ID
-        long yqm = usersMapper.getuserIdById(userId);
+
+        if(null== usersMapper.getuserIdById(userId)|| "".equals(usersMapper.getuserIdById(userId))){
+            Map map =new HashMap();
+            map.put("code",1);
+            map.put("msg","该用户不存在！");
+            return map;
+
+        }
+        long yqm=usersMapper.getuserIdById(userId);
         //用户唯一ID调用生成6位邀请码
         String inviteCode = ShareCodeUtil.idToCode(yqm);
         Integer userLevel = 0;
@@ -174,7 +195,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
         usersMapper.updateById(byUserId1);
 
-        String BYQM = String.valueOf(usersMapper.BYQMById(userId));
+        String BYQM = usersMapper.BYQMById(userId);
 
         if ("1".equals(BYQM)) {
             Map map = new HashMap();
@@ -313,7 +334,7 @@ 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 {
             return;