diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java index 3955b4d46..1a100ff44 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java @@ -30,14 +30,14 @@ public class UserAuthenticationController extends XktBaseController { final IUserAuthenticationService userAuthService; - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin')") + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,seller')") @ApiOperation(value = "新增代发 ", httpMethod = "POST", response = R.class) @PostMapping() public R create(@Validated @RequestBody UserAuthCreateVO createVO) { return R.ok(userAuthService.create(BeanUtil.toBean(createVO, UserAuthCreateDTO.class))); } - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin')") + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,seller')") @ApiOperation(value = "APP 代发列表 ", httpMethod = "POST", response = R.class) @PostMapping("/app/page") public R> appPage(@Validated @RequestBody UserAuthPageVO pageVO) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java index 57133cc27..08a764fa5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java @@ -58,11 +58,5 @@ public class UserNoticeController extends XktBaseController { return R.ok(userNoticeService.appBatchRead()); } - @ApiOperation(value = "APP - 未读的分类,点击进入分类列表时调用变为已读", httpMethod = "PUT", response = R.class) - @PutMapping("/app/read/type/{targetNoticeType}") - public R appTypeRead(@PathVariable Integer targetNoticeType) { - return R.ok(userNoticeService.appTypeRead(targetNoticeType)); - } - } diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java index f1c494da5..e7b3cf22a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java @@ -41,7 +41,7 @@ public class StoreProductCategoryAttribute extends XktBaseEntity { */ private String shaftLiningMaterial; /** - * 靴筒面材质 + * 鞋面材质(靴筒面材质) */ private String shaftMaterial; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java index 0cad2a092..57863d4a4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java @@ -84,10 +84,23 @@ public class UserNoticeServiceImpl implements IUserNoticeService { * @return List */ @Override - @Transactional(readOnly = true) + @Transactional public Page appTypePage(UserNoticeAppTypePageDTO pageDTO) { + Long userId = SecurityUtils.getUserIdSafe(); + if (ObjectUtils.isEmpty(userId)) { + throw new ServiceException("用户未登录,请先登录!", HttpStatus.ERROR); + } PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); List list = this.userNoticeMapper.selectAppTypePage(SecurityUtils.getUserId(), pageDTO.getTargetNoticeType()); + // 将用户所有未读消息设为已读 + List targetUserNoticeList = this.userNoticeMapper.selectList(new LambdaQueryWrapper() + .eq(UserNotice::getUserId, userId).eq(UserNotice::getReadStatus, 0) + .eq(UserNotice::getTargetNoticeType, pageDTO.getTargetNoticeType()) + .eq(UserNotice::getDelFlag, Constants.UNDELETED)); + if (CollectionUtils.isNotEmpty(targetUserNoticeList)) { + targetUserNoticeList.forEach(x -> x.setReadStatus(1)); + this.userNoticeMapper.updateById(targetUserNoticeList); + } return Page.convert(new PageInfo<>(list)); }