Merge remote-tracking branch 'origin/pre' into pre

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java

@@ -34,7 +34,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
-    public static final LocalDateTime spotTime = LocalDateTime.parse("2021-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    public static final LocalDateTime spotTime = LocalDateTime.parse("2021-10-14 21:30:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     private static final AdamUserMemberVo obj = new AdamUserMemberVo();
 
     public static AdamUserMemberVo getNew() {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -51,16 +51,16 @@ public class AdamMemberController {
                 memberVo.setUserMemberVo(userMemberVo);
 
                 if (null == userMemberVo || !userMemberVo.isActive()) {
-                    memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 1));
+                    memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0));
                 } else if (userMemberVo.isActive()) {
                     memberVo.setRightsVoList(
                             userMemberVo.isOldMember() ? adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 1)
-                            : adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 1)
+                            : adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0)
                     );
                 }
             } else {
                 memberVo.setUserMemberVo(null);
-                memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 1));
+                memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0));
             }
         }
         return ResponseDto.success(memberVo);