From d9361b75e7072b29535c571a76e0b9e7860d6805 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:38:53 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示

---
 src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
index 6d6155c..df186b1 100644
--- a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
+++ b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
@@ -40,8 +40,10 @@
 
     <select id="selectApiLeaderProfitListInPage" resultType="cc.mrbird.febs.mall.entity.MallLeaderAchieve">
         select a.*,
+               b.name nickname,
                c.goods_name goodsName
         from mall_leader_achieve a
+        inner join mall_member b on a.member_id = b.id
         inner join mall_order_item c on a.order_item_id = c.id
         <where>
             a.state = 2
@@ -49,8 +51,8 @@
                 <if test="record.invitedId != null and record.invitedId != ''">
                     and a.unique_code = #{record.invitedId}
                 </if>
-                <if test="record.createdTime!=null">
-                    and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(#{record.createdTime}, '%Y-%m-%d')
+                <if test="record.createdTime != null and record.createdTime != ''">
+                    and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{record.createdTime}
                 </if>
             </if>
         </where>

--
Gitblit v1.9.1