diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationServiceImpl.java index 63fe52e..1e23489 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/OperationServiceImpl.java @@ -144,7 +144,7 @@ public class OperationServiceImpl implements OperationService { .eq(OperationDO::getOperatorMemberId, operateMemberId) .eqIfPresent(OperationDO::getMemberId, memberId) .eq(OperationDO::getBizType, MemberRecentOperateEnum.MEMBER_LOOK_WECHAT.getType()) - .between(OperationDO::getCancelTime, now.with(LocalTime.MIN), now.with(LocalTime.MAX)) + .between(OperationDO::getCreateTime, now.with(LocalTime.MIN), now.with(LocalTime.MAX)) ); return Math.toIntExact(count); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java index 14d6b82..f35e854 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java @@ -218,6 +218,12 @@ public class RecentServiceImpl implements RecentService { } } } + // 屏蔽/拉黑 + if (ObjectUtil.equals(dto.getAction(), MemberRecentOperateEnum.MEMBER_SHIELD)) { + if (ObjectUtil.isNotEmpty(operationDO)) { + throw exception(MemberErrorCode.EMPTY, "已拉黑,无需重复操作"); + } + } operationDO = new OperationDO(); operationDO.setMemberId(dto.getMemberId()); operationDO.setOperatorMemberId(dto.getOperatorMemberId()); @@ -232,9 +238,7 @@ public class RecentServiceImpl implements RecentService { } // 屏蔽/拉黑 if (ObjectUtil.equals(dto.getAction(), MemberRecentOperateEnum.MEMBER_SHIELD)) { - if (ObjectUtil.isNotEmpty(operationDO)) { - throw exception(MemberErrorCode.EMPTY, "已拉黑,无需重复操作"); - } + } // 举报 List reportList = new ArrayList() {{