fix:屏蔽bug
This commit is contained in:
1 parent
204c4a7129
commit
e3726942d2
2 files changed
+8
-4
No files matched your search
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
+7
-3
@@ -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<MemberRecentOperateEnum> reportList = new ArrayList<MemberRecentOperateEnum>() {{
|
||||
|
||||
Reference in new issue
Block a user