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

---
 src/main/resources/mapper/modules/MallSalesmanMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallSalesmanMapper.xml b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
index 67a3b9f..a7a8dd5 100644
--- a/src/main/resources/mapper/modules/MallSalesmanMapper.xml
+++ b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
@@ -41,7 +41,7 @@
                 </if>
             </if>
         </where>
-        group by a.city
+        group by a.city,a.province
     </select>
 
     <select id="selectSumOrderAmountByProvinceAndCity" resultType="java.math.BigDecimal">
@@ -161,6 +161,13 @@
         a.phone,
         d.name nickname,
         (
+            select ifnull(sum(e.amount),0)
+            from mall_money_flow e
+            where e.flow_type = 1
+            and e.type = 20
+            and e.member_id = a.member_id
+        ) rechargeSendAmount,
+        (
             select count(b.id)
             from mall_order_info b
             <where>

--
Gitblit v1.9.1