release- mq bug修复

luoo_common/src/main/java/constants/TaskPointIdConstants.java

@@ -21,9 +21,6 @@ public class TaskPointIdConstants {
     //  首次收藏期刊
     public static final String FIRST_COLLECT_JOURNAL = "9";
 
-
-    // 每日登录 todo
-    public static final String DAILY_LOGIN = "10";
     // 每日签到
     public static final String DAILY_SIGN = "11";
     // 分享期刊

luoo_common/src/main/java/pojo/UserPointLog.java

@@ -55,4 +55,5 @@ public class UserPointLog implements Serializable {
     @ApiModelProperty(value = "更新人")
     private String updateUser;
 
+
 }

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

@@ -153,9 +153,9 @@ public class MyController extends BaseController {
 
         // 信息是否已完善
         if (StringUtils.isNotBlank(userInfoUpdateDto.getBirthDay())
-        || StringUtils.isNotBlank(userInfoUpdateDto.getNickName())
+        && StringUtils.isNotBlank(userInfoUpdateDto.getNickName())
-                || !Objects.isNull(userInfoUpdateDto.getSex())
+                && !Objects.isNull(userInfoUpdateDto.getSex())
-                || StringUtils.isNotBlank(userInfoUpdateDto.getBirthDay())
+                && StringUtils.isNotBlank(userInfoUpdateDto.getBirthDay())
         ) {
             userPointLogService.addByTaskNew(TaskPointIdConstants.MODIFY_INFORMATION, authorization);
         }

luoo_user/src/main/java/com/luoo/user/listener/PointLogListener.java

@@ -5,6 +5,7 @@ import com.luoo.user.service.UserPointLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -23,9 +24,11 @@ public class PointLogListener {
   private UserPointLogService userPointLogService;
 
   @RabbitHandler
-  public void executePointLog(UserPointLog userPointLog) {
+  public void executePointLog(Object userPointLog) {
     log.info("userPointLog:{}", userPointLog);
-    userPointLogService.add(userPointLog);
+    UserPointLog result = new UserPointLog();
+    BeanUtils.copyProperties(userPointLog, result);
+    userPointLogService.add(result);
   }
 
 }

luoo_user/src/main/java/com/luoo/user/pojo/UserPointLog.java

@@ -80,8 +80,5 @@ public class UserPointLog implements Serializable {
     @ApiModelProperty(value = "更新人")
     private String updateUser;
 
-    @Transient
-    @ApiModelProperty(value = "所在月份")
-    private String createMonth;
 
 }

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

@@ -24,10 +24,7 @@ import constants.Constants;
 import constants.ErrorConstants;
 import constants.TaskPointIdConstants;
 import dto.UserLoginDto;
-import enums.UserBankStateEnum;
+import enums.*;
-import enums.UserRealNameStateEnum;
-import enums.UserStatusEnum;
-import enums.WithdrawStateEnum;
 import exception.BizException;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -254,6 +251,9 @@ public class UserInfoService {
             userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
             userInfo.setThumbnail(Constants.DEFAULT_USER_THUMBNAIL);
             userInfo.setSignature(Constants.DEFAULT_USER_SIGNATURE);
+            userInfo.setIsAuthor(0);
+            userInfo.setPoint(0);
+            userInfo.setVipStatus(UserVipStatusEnum.INITIAL.getCode());
 
             isNewUser = true;
         } else {
@@ -324,6 +324,9 @@ public class UserInfoService {
             userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
             userInfo.setThumbnail(Constants.DEFAULT_USER_THUMBNAIL);
             userInfo.setSignature(Constants.DEFAULT_USER_SIGNATURE);
+            userInfo.setIsAuthor(0);
+            userInfo.setPoint(0);
+            userInfo.setVipStatus(UserVipStatusEnum.INITIAL.getCode());
 
             isNewUser = true;
         } else {
@@ -363,6 +366,9 @@ public class UserInfoService {
             userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
             userInfo.setThumbnail(Constants.DEFAULT_USER_THUMBNAIL);
             userInfo.setSignature(Constants.DEFAULT_USER_SIGNATURE);
+            userInfo.setIsAuthor(0);
+            userInfo.setPoint(0);
+            userInfo.setVipStatus(UserVipStatusEnum.INITIAL.getCode());
 
             isNewUser = true;
         } else {
@@ -444,6 +450,9 @@ public class UserInfoService {
             userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
             userInfo.setThumbnail(Constants.DEFAULT_USER_THUMBNAIL);
             userInfo.setSignature(Constants.DEFAULT_USER_SIGNATURE);
+            userInfo.setIsAuthor(0);
+            userInfo.setPoint(0);
+            userInfo.setVipStatus(UserVipStatusEnum.INITIAL.getCode());
 
             isNewUser = true;
         } else {