diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java index e4576d7..e69f7ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java @@ -45,7 +45,7 @@ public class BusiNoticeSign extends DlBaseEntity /** 是否超级报名 */ @Excel(name = "是否超级报名") - private Integer isSuper; + private String isSuper; /** 联系方式 */ @Excel(name = "联系方式") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java index f4c8d3f..d50d7d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java @@ -1,9 +1,11 @@ package com.ruoyi.busi.mapper; import java.util.List; + import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.busi.vo.BusiNoticeVo; import com.ruoyi.query.BusiNoticeQuery; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,7 +18,16 @@ import org.apache.ibatis.annotations.Mapper; * @date 2025-03-17 */ @Mapper -public interface BusiNoticeMapper extends BaseMapper -{ +public interface BusiNoticeMapper extends BaseMapper { IPage queryListPage(@Param("entity") BusiNoticeQuery query, Page page); + + /** + * 查询博主报名的通告 + * + * @param userId 博主user表id + * @return java.util.List + * @author PQZ + * @date 11:04 2025/3/22 + **/ + List queryListByUserId(@Param("userId") Long userId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java index 0d00502..5b02871 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.busi.vo.BusiNoticeVo; import com.ruoyi.query.BusiNoticeQuery; /** @@ -24,6 +25,16 @@ public interface IBusiNoticeService extends IService * @return java.util.List **/ List listByUserId(Long userId); + + /** + * 查询博主报名的通告 + * @author PQZ + * @date 11:05 2025/3/22 + * @param userId 博主id + * @return java.util.List + **/ + List queryListByUserId(Long userId); + IPage queryListPage(BusiNoticeQuery query, Page page); void saveVo(BusiNotice data); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 3ede425..b790921 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.ruoyi.busi.vo.BusiNoticeVo; import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -57,4 +58,17 @@ public class BusiNoticeServiceImpl extends ServiceImpl + * @author PQZ + * @date 11:05 2025/3/22 + **/ + @Override + public List queryListByUserId(Long userId) { + return busiNoticeMapper.queryListByUserId(userId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java index 3528217..4d1ea7f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java @@ -10,4 +10,8 @@ public class BusiNoticeVo extends BusiNotice { private String userNickName; /** 平台名称 */ private String platformName; + /** 是否超级报名*/ + private String isSuper; + /**通告合作状态*/ + private String signStatus; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java index 4401836..08a4a1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java @@ -59,17 +59,28 @@ public class MemberUserController extends BaseController { * @author PQZ * @date 11:36 2025/3/21 **/ - @PreAuthorize("@ss.hasPermi('member:member:query')") @GetMapping(value = "/announcerDetail/{userId}") - public AjaxResult getInfo(@PathVariable("userId") Long userId) { + public AjaxResult announcerDetail(@PathVariable("userId") Long userId) { return success(memberUserService.announcerDetail(userId)); } + /** + * 获取博主详细信息 + * + * @param userId 用户表id + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 10:40 2025/3/22 + **/ + @GetMapping(value = "/bloggerDetail/{userId}") + public AjaxResult bloggerDetail(@PathVariable("userId") Long userId) { + return success(memberUserService.bloggerDetail(userId)); + } + /** * 导出会员列表 */ - @PreAuthorize("@ss.hasPermi('member:member:export')") @Log(title = "会员", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, MemberUser memberUser) { @@ -82,7 +93,6 @@ public class MemberUserController extends BaseController { /** * 新增会员 */ - @PreAuthorize("@ss.hasPermi('member:member:add')") @Log(title = "会员", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody MemberUser memberUser) { @@ -92,7 +102,6 @@ public class MemberUserController extends BaseController { /** * 修改会员 */ - @PreAuthorize("@ss.hasPermi('member:member:edit')") @Log(title = "会员", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody MemberUser memberUser) { @@ -102,7 +111,6 @@ public class MemberUserController extends BaseController { /** * 删除会员 */ - @PreAuthorize("@ss.hasPermi('member:member:remove')") @Log(title = "会员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java index 5fd1244..8e3c4a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.member.domain.MemberBusiCard; import com.ruoyi.member.vo.MemberBusiCardVO; +import java.util.List; + /** * 博主名片Service接口 * @@ -35,6 +37,16 @@ public interface IMemberBusiCardService extends IService { **/ MemberBusiCardVO queryById(String id); + /** + * 通过用户id查询名片 + * + * @param userId 用户表id + * @return java.util.List + * @author PQZ + * @date 10:49 2025/3/22 + **/ + List queryListByUserId(Long userId); + /** * 审核博主名片信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java index 71977cd..8f8be3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java @@ -37,4 +37,14 @@ public interface IMemberUserService extends IService { **/ MemberUserVO announcerDetail(Long userId); + /** + * 获取博主详情 + * + * @param userId 用户表id + * @return com.ruoyi.member.vo.MemberUserVO + * @author PQZ + * @date 10:41 2025/3/22 + **/ + MemberUserVO bloggerDetail(Long userId); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java index 494d51b..b20b736 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java @@ -1,8 +1,10 @@ package com.ruoyi.member.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.domain.MemberBusiCard; import com.ruoyi.member.mapper.MemberBusiCardMapper; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * 博主名片Service业务层处理 @@ -51,6 +54,23 @@ public class MemberBusiCardServiceImpl extends ServiceImpl + * @author PQZ + * @date 10:49 2025/3/22 + **/ + @Override + public List queryListByUserId(Long userId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0) + .eq(MemberBusiCard::getApprovalStatus,"1") + .eq(MemberBusiCard::getUserId,userId); + return list(lambdaQueryWrapper); + } + /** * 审核博主名片信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index 31ad08d..a16fd86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.busi.service.IBusiEvaluateService; import com.ruoyi.busi.service.IBusiNoticeService; import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.mapper.MemberUserMapper; +import com.ruoyi.member.service.IMemberBusiCardService; import com.ruoyi.member.service.IMemberCardService; import com.ruoyi.member.service.IMemberUserService; import com.ruoyi.member.vo.MemberUserVO; @@ -17,13 +18,12 @@ import javax.annotation.Resource; /** * 会员Service业务层处理 - * + * * @author pqz * @date 2025-03-17 */ @Service -public class MemberUserServiceImpl extends ServiceImpl implements IMemberUserService -{ +public class MemberUserServiceImpl extends ServiceImpl implements IMemberUserService { @Autowired private MemberUserMapper memberUserMapper; @Resource @@ -32,6 +32,8 @@ public class MemberUserServiceImpl extends ServiceImpl evaluates; /**开卡记录*/ List cards; - /**通告列表*/ + /**通告主发布的通告列表*/ List notices; + /**博主报名的通告列表*/ + List noticeVos; + /**名片信息*/ + List busiCards; } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 24d55e9..654df6a 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -45,5 +45,16 @@ and main.create_time between #{entity.params.beginCreateTime} and #{entity.params.endCreateTime} +