release: 新用户邀请获得积分

luoo_user/src/main/java/com/luoo/user/controller/MyController.java

@@ -109,6 +109,13 @@ public class MyController extends BaseController {
         userRespDTO.setEnableComment(user.getEnableComment());
         userRespDTO.setPoint(user.getPoint());
 
+        String invitationUserId = user.getInvitationUserId();
+        if(StringUtils.isNotEmpty(invitationUserId)) {
+            UserInfo myInvitationUser = userInfoService.findById(invitationUserId);
+            userRespDTO.setInvitationUserId(myInvitationUser.getId());
+            userRespDTO.setInvitationCode(myInvitationUser.getInvitationCode());
+        }
+
         if (null != user.getEnableNotice()) {
             userRespDTO.setEnableNotice(user.getEnableNotice());
         }
@@ -150,6 +157,11 @@ public class MyController extends BaseController {
         // 修改了性别
         boolean isChangeSex = !Objects.equals(userInfoUpdateDto.getSex(), user.getSex());
 
+        if(StringUtils.isNotBlank(userInfoUpdateDto.getInvitationCode()) && StringUtils.isBlank(user.getInvitationUserId())) {
+            // 只有没有被邀请过的才会触发，再次修改无效
+            userInfoService.bindInvitationCode(user, userInfoUpdateDto.getInvitationCode());
+        }
+
         if (!StringTools.isEmpty(nickName)) {
             user.setNickName(nickName);
             rabbitTemplate.convertAndSend("userInfoCommentCache", userLoginDto.getUserId());

luoo_user/src/main/java/com/luoo/user/dto/UserInfoUpdateDto.java

@@ -16,4 +16,7 @@ public class UserInfoUpdateDto {
 	private String signature;
 	@ApiModelProperty(value = "生日，格式为: yyyy.MM.dd")
 	private String birthDay;
+
+	@ApiModelProperty(value = "邀请码，填写的邀请码，不是本人的邀请码")
+	private String invitationCode;
 }

luoo_user/src/main/java/com/luoo/user/dto/request/LoginReq.java

@@ -32,6 +32,4 @@ public class LoginReq implements Serializable {
 	@ApiModelProperty(name = "deviceBrand", value = "设备品牌", required = false)
 	String deviceBrand;
 
-	@ApiModelProperty(name = "invitationCode", value = "邀请码", required = false)
-	String invitationCode;
 }

luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java

@@ -104,4 +104,19 @@ public class UserRespDTO implements Serializable {
 	 * 积分
 	 */
 	private Integer point;
+
+	/**
+	 * 我的邀请人的邀请码
+	 */
+	private String invitationCode;
+
+	/**
+	 * 我的邀请人
+	 */
+	private String invitationUserId;
+
+	/**
+	 * 我的邀请码
+	 */
+	private String myInvitationCode;
 }

luoo_user/src/main/java/com/luoo/user/service/UserInfoService.java

@@ -7,6 +7,7 @@ import com.luoo.user.dao.UserInfoDao;
 import com.luoo.user.dao.UserPointLogDao;
 import com.luoo.user.dao.UserRealNameDao;
 import com.luoo.user.dao.WithdrawDao;
+import com.luoo.user.dto.UserInfoUpdateDto;
 import com.luoo.user.dto.UserQueryReq;
 import com.luoo.user.dto.UserRealNameCheckDto;
 import com.luoo.user.dto.UserRealNameFormDto;
@@ -270,17 +271,30 @@ public class UserInfoService {
         if(isNewUser) {
             // 只有新用户会获得积分
             userPointLogService.addByTaskNew(TaskPointIdConstants.NEW_USER_WELCOME_AWARD, userInfo.getId());
+        }
+
+        return Constants.TOKEN_PREFIX
+            + jwtUtil.createJWT(userInfo.getId(), userInfo.getNickName(), Constants.TOKEN_ROLE_APP_USER, userInfo.getAvatar());
+    }
 
-            if(StringUtils.isNotBlank(loginReq.getInvitationCode())) {
-                // 新用户，且存在邀请码
-                UserInfo userInfoDaoByInvitationCode = userInfoDao.findByInvitationCode(loginReq.getInvitationCode());
+    /**
+     * 绑定邀请人
+     *
+     * @param userInfo  用户
+     * @param invitationCode 邀请码
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void bindInvitationCode(UserInfo userInfo, String invitationCode) {
+        if (StringUtils.isNotBlank(invitationCode)) {
+            UserInfo userInfoDaoByInvitationCode = userInfoDao.findByInvitationCode(invitationCode);
             if (null != userInfoDaoByInvitationCode) {
+                // 设置邀请人
                 userInfo.setInvitationUserId(userInfoDaoByInvitationCode.getId());
-                    userInfo.setInvitationCode(userInfoDaoByInvitationCode.getInvitationCode());
-                    userInfoDao.save(userInfo);
-
-                    // 邀请码有效，且新用户，则给邀请人积分
-                    userPointLogService.addByTaskNew(TaskPointIdConstants.NEW_USER_INVITE, userInfoDaoByInvitationCode.getId());
+                this.update(userInfo);
+                // 邀请人与被邀请人同时获取积分
+                userPointLogService.addByTaskDailyAndUserId(TaskPointIdConstants.NEW_USER_INVITE, userInfoDaoByInvitationCode.getId());
+                userPointLogService.addByTaskDailyAndUserId(TaskPointIdConstants.NEW_USER_INVITE, userInfo.getId());
+            }
 
             List<UserPointLog> list = userPointLogDao.findUserPointLogsByUserIdAndTaskPointId(userInfoDaoByInvitationCode.getId(), TaskPointIdConstants.NEW_USER_INVITE);
             if (list.size() == 3) {
@@ -292,12 +306,8 @@ public class UserInfoService {
             } else if (list.size() == 20) {
                 userPointLogService.addByTaskDailyAndUserId(TaskPointIdConstants.INVITE_USER_20, userInfoDaoByInvitationCode.getId());
             }
-                }
-            }
-        }
 
-        return Constants.TOKEN_PREFIX
-            + jwtUtil.createJWT(userInfo.getId(), userInfo.getNickName(), Constants.TOKEN_ROLE_APP_USER, userInfo.getAvatar());
+        }
     }
 
     public String loginOrRegister(UserInfo loginUserInfo) {