fix 邀请人

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -80,11 +80,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return null;
     }
 
+    @Override
+    public User queryByAccount(String userAccount) {
+        User user = getOne(new LambdaQueryWrapper<User>()
+                .eq(User::getUserAccount, userAccount)
+                .last("limit 1"));
+        if (Validator.isNotNull(user)) {
+            return user;
+        }
+        return null;
+    }
+
 
     @Override
     public List<UserVo> queryList(UserQueryBo bo) {
         LambdaQueryWrapper<User> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getUserAccout()), User::getUserAccout, bo.getUserAccout());
+        lqw.eq(StrUtil.isNotBlank(bo.getUserAccout()), User::getUserAccount, bo.getUserAccout());
         lqw.like(StrUtil.isNotBlank(bo.getNickname()), User::getNickname, bo.getNickname());
         lqw.like(StrUtil.isNotBlank(bo.getRealname()), User::getRealname, bo.getRealname());
         lqw.eq(bo.getSex() != null, User::getSex, bo.getSex());

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -102,7 +102,7 @@ public class WxLoginService
      * @param tel
      * @return
      */
-    public Boolean register_small(String openId,String unionId,String tel) {
+    public Boolean register_small(String openId,String unionId,String tel,String inviteCode) {
         User bo = new User();
         bo.setOpenId(openId);
         bo.setUnionId(unionId);
@@ -111,7 +111,7 @@ public class WxLoginService
         bo.setNickname(TelPhoneUtils.hideTelPhone(tel));
         //雪花算法产生账号ID
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
-        bo.setUserAccout(String.valueOf(idWorker.nextId()));
+        bo.setUserAccount(String.valueOf(idWorker.nextId()));
         bo.setSex(1);
         bo.setStatus(1);
         bo.setRegisterPlat("1");
@@ -120,6 +120,12 @@ public class WxLoginService
         bo.setLastLoginTime(DateUtils.getNowTime());
         bo.setCreateTime(DateUtils.getNowTime());
         bo.setUpdateTime(DateUtils.getNowTime());
+        if(inviteCode!=null){
+            User inviteUser = iUserService.queryByAccount(inviteCode);
+            if(inviteUser!=null){
+                bo.setInviteUserAccount(inviteCode);
+            }
+        }
         if(iUserService.save(bo)){
             UserSchoolInfo schoolInfo = new UserSchoolInfo();
             schoolInfo.setUserId(bo.getUserId());
@@ -141,7 +147,7 @@ public class WxLoginService
         String phoneNumber = obtainWxPhone(loginBody.getIv(),loginBody.getEncryptedData(),session_key);
         User user = iUserService.queryByUnionId(unionId);
         if(user==null){
-            if(!register_small(openId,unionId,phoneNumber)){
+            if(!register_small(openId,unionId,phoneNumber,loginBody.getInviteCode())){
                 throw new CustomException("注册失败");
             }
             user = iUserService.queryByUnionId(unionId);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxTokenService.java

@@ -136,7 +136,7 @@ public class WxTokenService
      */
     public String createToken(ClientLoginUser loginUser)
     {
-        String token = IdUtil.simpleUUID()+loginUser.getUser().getUserAccout();
+        String token = IdUtil.simpleUUID()+loginUser.getUser().getUserAccount();
         loginUser.setToken(token);
         setUserAgent(loginUser);
         refreshToken(loginUser);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -29,7 +29,7 @@ private static final long serialVersionUID=1L;
     private Long userId;
 
     /** 账号 */
-    private String userAccout;
+    private String userAccount;
 
     /** 昵称 */
     private String nickname;
@@ -137,4 +137,7 @@ private static final long serialVersionUID=1L;
     private String email;
 
     private String avatar;
+
+    /** 邀请用户ID用户积分 */
+    private String inviteUserAccount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -28,7 +28,7 @@ public interface IUserService extends IService<User> {
 
 	User queryByUnionId(String unionId);
 
-
+	User queryByAccount(String userAccount);
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxLoginBody.java

@@ -37,6 +37,9 @@ public class WxLoginBody {
     @NotBlank(message = "encryptedData不能为空")
     private String encryptedData;
 
+    @ApiModelProperty("邀请码")
+    private String inviteCode;
+
 
 
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.user.domain.User" id="UserResult">
         <result property="userId" column="user_id"/>
-        <result property="userAccout" column="user_accout"/>
+        <result property="userAccount" column="user_account"/>
         <result property="nickname" column="nickname"/>
         <result property="realname" column="realname"/>
         <result property="sex" column="sex"/>
@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="politic" column="politic"/>
         <result property="email" column="email"/>
         <result property="avatar" column="avatar"/>
+        <result property="inviteUserAccount" column="invite_user_account"/>
     </resultMap>