From d5a0907b0bb734e13cae2092f3a004c30791a0e6 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:03:28 +0800
Subject: [PATCH] feat(mall): 添加活动模块 - 新增 ActivityServiceImpl 类实现活动服务 - 添加 AdminActivityController 和 ViewActivityController 控制器处理活动相关请求 - 创建 IActivityService 接口定义活动服务方法 - 设计 MallActivity 实体类表示活动信息 - 增加 MallActivityMapper 接口用于活动数据访问

---
 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