admin/AdvisorServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改细节问题

Browse Source
This commit is contained in:
easonzhu 2025-02-12 22:22:38 +08:00
parent 49820fdaa2
commit 53a6dbea2d
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/upchina/common/query/CommentBlackQuery.java
View File

@ -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;
}
}

1
src/main/java/com/upchina/common/service/CommentBlackService.java
View File

@ -155,6 +155,7 @@ public class CommentBlackService {
QueryWrapper<CommentBlack> 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())

11
src/main/java/com/upchina/group/controller/admin/AdminGroupMessageController.java
View File

@ -32,7 +32,7 @@ public class AdminGroupMessageController {
@ApiOperation("后台发送互动消息")
@PostMapping("/admin/group/message/sendAdvisorMessage")
public CommonResult<OnlyIdVO> 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<Void> 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<AppPager<GroupMessageVO>> getMessageList(@Validated @RequestBody @ApiParam(required = true) ListGroupMessageQuery query,
@RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) {
@RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUserVO) {
AppPager<GroupMessageVO> list = adminGroupMessageService.getMessageList(query, backendUserVO);
return CommonResult.success(list);
}
@ -67,7 +67,7 @@ public class AdminGroupMessageController {
@ApiOperation("后台推荐产品消息")
@PostMapping("/admin/group/message/sendProductMessage")
public CommonResult<OnlyIdVO> 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<Void> 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<Void> setFirstAudit(
@Validated @RequestBody @ApiParam(required = true) GroupMessageStatusQuery query,
@RequestAttribute(value = "backendUser", required = false) BackendUserVO backendUser) {
if (backendUser == null) {
throw new BizException(ResponseStatus.SESSION_EXPIRY);
}

3
src/main/java/com/upchina/group/query/SaveGroupQuery.java
View File

@ -53,11 +53,9 @@ public class SaveGroupQuery {
private Integer pageId;
@ApiModelProperty("原价")
@NotNull
private BigDecimal originalPrice;
@ApiModelProperty("活动价")
@NotNull
private BigDecimal activityPrice;
@ApiModelProperty("支付链接")
@ -268,5 +266,4 @@ public class SaveGroupQuery {
this.wechatWorkId = wechatWorkId;
}
}

3
src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java
View File

@ -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<GroupMessageVO> getMessageList(ListGroupMessageQuery query, BackendUserVO backendUser) {