From 53a6dbea2d2798c374a918dda48aae41a10761b4 Mon Sep 17 00:00:00 2001 From: easonzhu Date: Wed, 12 Feb 2025 22:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/upchina/common/query/CommentBlackQuery.java | 13 +++++++++++++ .../upchina/common/service/CommentBlackService.java | 1 + .../admin/AdminGroupMessageController.java | 11 +++++------ .../com/upchina/group/query/SaveGroupQuery.java | 3 --- .../service/admin/AdminGroupMessageService.java | 3 ++- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/upchina/common/query/CommentBlackQuery.java b/src/main/java/com/upchina/common/query/CommentBlackQuery.java index 08e0088..f4025e2 100644 --- a/src/main/java/com/upchina/common/query/CommentBlackQuery.java +++ b/src/main/java/com/upchina/common/query/CommentBlackQuery.java @@ -57,6 +57,11 @@ public class CommentBlackQuery extends PageQuery { @Max(3) private Integer scope; + @ApiModelProperty("禁言状态：0生效中 1已解除 2自然过期") + @Min(0) + @Max(2) + private Integer status; + public String getUserName() { return userName; } @@ -168,4 +173,12 @@ public class CommentBlackQuery extends PageQuery { public void setScope(Integer scope) { this.scope = scope; } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } } diff --git a/src/main/java/com/upchina/common/service/CommentBlackService.java b/src/main/java/com/upchina/common/service/CommentBlackService.java index 930ee22..1ff59dd 100644 --- a/src/main/java/com/upchina/common/service/CommentBlackService.java +++ b/src/main/java/com/upchina/common/service/CommentBlackService.java @@ -155,6 +155,7 @@ public class CommentBlackService { QueryWrapper wrapper = Wrappers.query(); wrapper.like(StrUtil.isNotEmpty(query.getUserName()), "user_name", query.getUserName()) .eq(StrUtil.isNotEmpty(query.getPhone()), "phone", query.getPhone()) + .eq(query.getStatus() != null, "status", query.getStatus()) .eq(query.getType() != null, "type", query.getType()) .eq(query.getProductType() != null, "product_type", query.getProductType()) .eq(query.getProductType() != null && query.getProductId() != null, "product_id", query.getProductId()) diff --git a/src/main/java/com/upchina/group/controller/admin/AdminGroupMessageController.java b/src/main/java/com/upchina/group/controller/admin/AdminGroupMessageController.java index 4b00495..b1aac0d 100644 --- a/src/main/java/com/upchina/group/controller/admin/AdminGroupMessageController.java +++ b/src/main/java/com/upchina/group/controller/admin/AdminGroupMessageController.java @@ -32,7 +32,7 @@ public class AdminGroupMessageController { @ApiOperation("后台发送互动消息") @PostMapping("/admin/group/message/sendAdvisorMessage") public CommonResult sendAdvisorMessage(@Validated @RequestBody @ApiParam(required = true) SendGroupMessageAdminQuery query, - @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { + @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { if (backendUserVO == null) { throw new BizException(ResponseStatus.SESSION_EXPIRY); } @@ -43,7 +43,7 @@ public class AdminGroupMessageController { @ApiOperation("后台更新互动消息状态") @PostMapping("/admin/group/message/updateStatus") public CommonResult updateStatus(@Validated @RequestBody @ApiParam(required = true) UpdateGroupMessageStatusQuery query, - @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { + @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { adminGroupMessageService.updateStatus(query, backendUserVO); return CommonResult.success(); } @@ -51,7 +51,7 @@ public class AdminGroupMessageController { @ApiOperation("后台获取互动消息") @PostMapping("/admin/group/message/getMessageList") public CommonResult> getMessageList(@Validated @RequestBody @ApiParam(required = true) ListGroupMessageQuery query, - @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { + @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { AppPager list = adminGroupMessageService.getMessageList(query, backendUserVO); return CommonResult.success(list); } @@ -67,7 +67,7 @@ public class AdminGroupMessageController { @ApiOperation("后台推荐产品消息") @PostMapping("/admin/group/message/sendProductMessage") public CommonResult sendProductMessage(@Validated @RequestBody @ApiParam(required = true) GroupMessageProductQuery query, - @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { + @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { if (backendUserVO == null) { throw new BizException(ResponseStatus.SESSION_EXPIRY); } @@ -78,7 +78,7 @@ public class AdminGroupMessageController { @ApiOperation("后台设置消息精选") @PostMapping("/admin/group/message/setMessageRecommend") public CommonResult setMessageRecommend(@Validated @RequestBody @ApiParam(required = true) GroupMessageRecommendQuery query, - @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { + @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) { adminGroupMessageService.setMessageRecommend(query, backendUserVO); return CommonResult.success(); } @@ -137,7 +137,6 @@ public class AdminGroupMessageController { public CommonResult setFirstAudit( @Validated @RequestBody @ApiParam(required = true) GroupMessageStatusQuery query, @RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUser) { - if (backendUser == null) { throw new BizException(ResponseStatus.SESSION_EXPIRY); } diff --git a/src/main/java/com/upchina/group/query/SaveGroupQuery.java b/src/main/java/com/upchina/group/query/SaveGroupQuery.java index e740674..67285e8 100644 --- a/src/main/java/com/upchina/group/query/SaveGroupQuery.java +++ b/src/main/java/com/upchina/group/query/SaveGroupQuery.java @@ -53,11 +53,9 @@ public class SaveGroupQuery { private Integer pageId; @ApiModelProperty("原价") - @NotNull private BigDecimal originalPrice; @ApiModelProperty("活动价") - @NotNull private BigDecimal activityPrice; @ApiModelProperty("支付链接") @@ -267,6 +265,5 @@ public class SaveGroupQuery { public void setWechatWorkId(Integer wechatWorkId) { this.wechatWorkId = wechatWorkId; } - } \ No newline at end of file diff --git a/src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java b/src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java index be996a8..2e34e92 100644 --- a/src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java +++ b/src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java @@ -103,10 +103,11 @@ public class AdminGroupMessageService { if (GroupMessageStatus.DELETED.equals(targetStatus)) { groupCacheService.removeMessage(groupMessageInDB); } else if (GroupMessageStatus.AUDITED.equals(targetStatus)) { - if (!IsOrNot.IS.value.equals(group.getFirstAudit())) { + if (IsOrNot.IS.value.equals(group.getFirstAudit())) { groupMessageService.publishMessage(groupMessageInDB); } } + clearCache(query.getId()); } public AppPager getMessageList(ListGroupMessageQuery query, BackendUserVO backendUser) {