From 2bd6eb1a457eae1513f314ed446d74d23dc1d8cf Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 18 Mar 2025 14:38:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E5=91=8A=E4=B8=BB=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberApplyController.java | 15 ++++++++----- .../member/service/IMemberApplyService.java | 9 ++++++++ .../service/impl/MemberApplyServiceImpl.java | 21 +++++++++++++++++++ .../mapper/member/MemberApplyMapper.xml | 4 +++- .../common/core/domain/DlBaseEntity.java | 4 ---- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java index 1f1b500..5666d9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java @@ -76,15 +76,20 @@ public class MemberApplyController extends BaseController { } - /** - * 修改通告主认证申请 - */ + * 审核通告主信息 + * + * @param memberApply {@link MemberApplyVO} + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 11:47 2025/3/18 + **/ @PreAuthorize("@ss.hasPermi('member:apply:edit')") @Log(title = "通告主认证申请", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody MemberApply memberApply) { - return toAjax(memberApplyService.updateById(memberApply)); + public AjaxResult edit(@RequestBody MemberApplyVO memberApply) { + memberApplyService.checkMemberApply(memberApply); + return toAjax(true); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java index 4f521b8..3d654e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java @@ -24,4 +24,13 @@ public interface IMemberApplyService extends IService { * @date 9:53 2025/3/18 **/ IPage queryListPage(MemberApplyVO memberApply, Page page); + + /** + * 审核通告主 + * + * @param memberApply {@link MemberApplyVO} + * @author PQZ + * @date 11:50 2025/3/18 + **/ + void checkMemberApply(MemberApplyVO memberApply); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java index 794b9fd..10df5a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java @@ -1,10 +1,12 @@ package com.ruoyi.member.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.vo.MemberApplyVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,4 +41,23 @@ public class MemberApplyServiceImpl extends ServiceImpl queryListPage(MemberApplyVO memberApply, Page page) { return memberApplyMapper.queryListPage(memberApply,page); } + + /** + * 审核通告主 + * + * @param memberApply {@link MemberApplyVO} + * @author PQZ + * @date 11:50 2025/3/18 + **/ + @Override + public void checkMemberApply(MemberApplyVO memberApply) { + //获取当前登录用户id + Long userId = SecurityUtils.getUserId(); + //当前时间 + Date nowDate = new Date(); + memberApply.setApprovalUserId(userId); + memberApply.setApprovalTime(nowDate); + updateById(memberApply); + //// TODO: 2025/3/18 审核成功之后更新会员表状态 + } } diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml index 98bd46f..c876421 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml @@ -32,9 +32,11 @@ del_flag=0 and nickname like concat('%', #{entity.nickname}, '%') and identity_type = #{entity.identityType} - and approval_status = #{entity.approvalStatus} + and approval_time = #{entity.approvalTime} and create_time between #{entity.startTime} and #{entity.endTime} + and approval_status != 0 + and approval_status = #{entity.approvalStatus} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java index 44b201f..111bb46 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java @@ -4,15 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * Entity基类--点亮