接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/mapper/ClockRecordMapper.java

@@ -47,8 +47,7 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
     /**
      * 分页查询活动店铺销量列表（销量活动 type=1）
      */
-    Page<ActivityShopSaleVo> queryActivityShopSalePage(Page<?> page,
-                                                        @Param("bo") ActivityShopSaleBo bo);
+    Page<ActivityShopSaleVo> queryActivityShopSalePage(Page<?> page,@Param("bo") ActivityShopSaleBo bo);
 
     /**
      * 查询仪表板统计数据

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -260,21 +260,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 分页查询活动店铺销量列表（销量活动 type=1） -->
     <select id="queryActivityShopSalePage" resultType="com.ruoyi.clock.domain.vo.ActivityShopSaleVo">
         SELECT
-            act.activity_name AS activityName,
-            ag.agent_name     AS agentName,
-            ap.product_name   AS productName,
-            s.shop_name       AS shopName,
-            IFNULL(SUM(p.amount), 0) AS saleCount
-        FROM tb_clock_record r
-        INNER JOIN tb_activity act ON r.activity_id = act.activity_id AND act.type = 1
-        LEFT JOIN tb_employee e    ON r.employee_id = e.employee_id
-        LEFT JOIN tb_agent ag      ON e.agent_id = ag.agent_id
-        LEFT JOIN tb_shop s        ON e.shop_id = s.shop_id
-        LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
-        LEFT JOIN tb_activity_product ap ON r.activity_id = ap.activity_id
-        LEFT JOIN tb_activity_agent aa ON r.activity_id = aa.activity_id
-        WHERE r.activity_id = #{bo.activityId}
-          AND r.status = 0
+        a.activity_name AS activityName,
+        ag.agent_name AS agentName,
+        cpr.product_name AS productName,
+        s.shop_name AS shopName,
+        SUM(cpr.amount) AS saleCount
+        FROM tb_clock_product_record cpr
+        -- 关联打卡主记录
+        LEFT JOIN tb_clock_record cr ON cpr.record_id = cr.record_id
+        -- 关联活动
+        LEFT JOIN tb_activity a ON cr.activity_id = a.activity_id
+        -- 关联员工（获取所属门店ID）
+        LEFT JOIN tb_employee e ON cr.employee_id = e.employee_id
+        -- 关联门店（获取门店名称和所属代理商ID）
+        LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
+        -- 关联代理商（获取代理商名称，需替换为实际代理商表名和字段名）
+        LEFT JOIN tb_agent ag ON s.agent_id = ag.agent_id
+        WHERE
+        a.activity_id= #{bo.activityId}
         <if test="bo.agentId != null">
             AND e.agent_id = #{bo.agentId}
         </if>
@@ -287,7 +290,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="bo.shopName != null and bo.shopName != ''">
             AND s.shop_name LIKE CONCAT('%', #{bo.shopName}, '%')
         </if>
-        GROUP BY act.activity_id, ag.agent_id, ap.id, s.shop_id
+        AND cr.status = 0
+        AND a.del_flag = '0'
+        AND e.del_flag = '0'
+        AND s.del_flag = '0'
+        AND ag.del_flag = '0'
+        -- 按门店+产品分组统计
+        GROUP BY
+        a.activity_name,
+        ag.agent_name,
+        cpr.product_name,
+        s.shop_name
         ORDER BY saleCount DESC
     </select>