From 924e00748a869a6b781f9e3f17bc6b6d042aa7d9 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 29 May 2025 15:15:58 +0800
Subject: [PATCH] 111

---
 .../main/java/com/ruoyi/member/domain/MemberApply.java |  2 ++
 .../java/com/ruoyi/member/domain/MemberBusiCard.java   |  3 +++
 .../member/service/impl/MemberApplyServiceImpl.java    |  2 ++
 .../member/service/impl/MemberBusiCardServiceImpl.java |  2 ++
 .../main/resources/mapper/member/MemberApplyMapper.xml | 10 ++++++----
 .../resources/mapper/member/MemberBusiCardMapper.xml   |  8 ++++++--
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java
index 44f5719..dc01462 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java
@@ -61,6 +61,8 @@ public class MemberApply extends DlBaseEntity
     /** 审核人id */
     @Excel(name = "审核人id")
     private Long approvalUserId;
+    /** 审核人名字 */
+    private String approvalUserName;
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java
index 8c8b181..a30d9f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java
@@ -95,6 +95,9 @@ public class MemberBusiCard extends DlBaseEntity
     @Excel(name = "审核人id")
     private Long approvalUserId;
 
+    /** 审核人名字 */
+    private String approvalUserName;
+
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
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 a4963dc..61378a2 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
@@ -73,10 +73,12 @@ public class MemberApplyServiceImpl extends ServiceImpl<MemberApplyMapper, Membe
     public void checkMemberApply(MemberApplyVO memberApply) {
         //获取当前登录用户id
         Long userId = SecurityUtils.getUserId();
+        SysUser sysUser = userService.selectUserById(userId);
         //当前时间
         Date nowDate = new Date();
         memberApply.setApprovalUserId(userId);
         memberApply.setApprovalTime(nowDate);
+        memberApply.setApprovalUserName(sysUser.getNickName());
         updateById(memberApply);
         //通过userId更新会员表身份类型
         LambdaUpdateWrapper<MemberUser> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
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 21cbeb7..fbf44aa 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
@@ -105,9 +105,11 @@ public class MemberBusiCardServiceImpl extends ServiceImpl<MemberBusiCardMapper,
     public void checkBusiCard(MemberBusiCard card) {
         //获取当前登录用户id
         Long userId = SecurityUtils.getUserId();
+        SysUser sysUser = userService.selectUserById(userId);
         //当前时间
         Date nowDate = new Date();
         card.setApprovalUserId(userId);
+        card.setApprovalUserName(sysUser.getNickName());
         card.setApprovalTime(nowDate);
         updateById(card);
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml
index 9cf72a3..60ae482 100644
--- a/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml
@@ -16,6 +16,7 @@
         <result property="approvalUserId"    column="approval_user_id"    />
         <result property="approvalTime"    column="approval_time"    />
         <result property="approvalRemark"    column="approval_remark"    />
+        <result property="approvalUserName"    column="approval_user_name"    />
         <result property="creator"    column="creator"    />
         <result property="createTime"    column="create_time"    />
         <result property="updater"    column="updater"    />
@@ -24,7 +25,7 @@
     </resultMap>
 
     <sql id="selectMemberApplyVo">
-        select id, user_id, nickname, identity_type, content, remark, images, approval_status, approval_user_id, approval_time, approval_remark, creator, create_time, updater, update_time, del_flag from dl_member_apply
+        select id, user_id, nickname, identity_type, content, remark, images, approval_status, approval_user_id, approval_time, approval_remark,approval_user_name, creator, create_time, updater, update_time, del_flag from dl_member_apply
     </sql>
     <select id="queryListPage" parameterType="MemberApply" resultMap="MemberApplyResult">
         <include refid="selectMemberApplyVo"/>
@@ -38,9 +39,10 @@
             <if test="entity.approvalStatus == 10"> and approval_status != 0</if>
             <if test="entity.approvalStatus != null  and entity.approvalStatus != '' and entity.approvalStatus != 10"> and approval_status = #{entity.approvalStatus}</if>
         </where>
-        <if test="entity.approvalStatus == 10">
-            order by approval_time desc
-        </if>
+        <choose>
+            <when test="entity.approvalStatus == 10">order by approval_time desc</when>
+            <otherwise>order by create_time asc </otherwise>
+        </choose>
     </select>
 
 
diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml
index 5168c39..a13e86d 100644
--- a/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/member/MemberBusiCardMapper.xml
@@ -20,6 +20,7 @@
         <result property="addrId"    column="addr_id"    />
         <result property="approvalStatus"    column="approval_status"    />
         <result property="approvalUserId"    column="approval_user_id"    />
+        <result property="approvalUserName"    column="approval_user_name"    />
         <result property="approvalTime"    column="approval_time"    />
         <result property="approvalRemark"    column="approval_remark"    />
         <result property="creator"    column="creator"    />
@@ -30,7 +31,7 @@
     </resultMap>
 
     <sql id="selectMemberBusiCardVo">
-        select id, user_id, nickname, platform_code, platform_name, account_number, account_name, fans_num, image, tel, price, content, addr_id, approval_status, approval_user_id, approval_time, approval_remark, creator, create_time, updater, update_time, del_flag from dl_member_busi_card
+        select id, user_id, nickname, platform_code, platform_name, account_number, account_name, fans_num, image, tel, price, content, addr_id, approval_status, approval_user_id, approval_user_name,approval_time, approval_remark, creator, create_time, updater, update_time, del_flag from dl_member_busi_card
     </sql>
 
     <select id="queryListPage" parameterType="MemberBusiCard" resultMap="MemberBusiCardResult">
@@ -43,7 +44,10 @@
             <if test="entity.approvalStatus == 10"> and approval_status != 0</if>
             <if test="entity.approvalStatus != null  and entity.approvalStatus != '' and entity.approvalStatus != 10"> and approval_status = #{entity.approvalStatus}</if>
         </where>
-        order by create_time asc
+        <choose>
+            <when test="entity.approvalStatus == 10">order by approval_time desc</when>
+            <otherwise>order by create_time asc </otherwise>
+        </choose>
     </select>
     <select id="queryById" resultType="com.ruoyi.member.vo.MemberBusiCardVO">
         SELECT