From a2b6253d1d05b69e5c2b9e7f6076f184b449fb96 Mon Sep 17 00:00:00 2001 From: Timi Date: Wed, 16 Sep 2026 12:54:39 +0800 Subject: [PATCH] add customerCount for list event record --- .../modules/gao/controller/GaoEventRecordController.java | 1 + .../api/modules/gao/mapper/GaoEventRecordMapper.java | 6 ++++++ .../api/modules/gao/service/GaoEventRecordService.java | 6 ++++++ .../service/implement/GaoEventRecordServiceImplement.java | 6 ++++++ .../api/modules/gao/vo/GaoEventRecordPageResult.java | 4 ++++ .../mapper/timi-server/gao/GaoEventRecordMapper.xml | 7 +++++++ 6 files changed, 30 insertions(+) diff --git a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java index 4a4073f..4e066da 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java +++ b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java @@ -69,6 +69,7 @@ public class GaoEventRecordController { result.setTotal(pageResult.getTotal()); result.setList(pageResult.getList()); result.setNumberValueTotal(resolveNumberValueTotal(page)); + result.setCustomerCount(service.countCustomerByRange(page)); { List customerIdList = result.getList().stream().map(GaoEventRecord::getCustomerId).toList(); Map eventMap = eventService.mapByIdList(result.getList().stream().map(GaoEventRecord::getEventId).toList()); diff --git a/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoEventRecordMapper.java b/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoEventRecordMapper.java index a71e9af..c71dc64 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoEventRecordMapper.java +++ b/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoEventRecordMapper.java @@ -87,6 +87,12 @@ public interface GaoEventRecordMapper extends BaseMapper /// @return 登记事件记录列表 List selectByRange(GaoEventRecordPage page); + /// 按登记记录列表条件统计去重客户数量 + /// + /// @param page 登记记录范围查询请求 + /// @return 去重后的客户数量 + long countCustomerByRange(GaoEventRecordPage page); + /// 按登记记录列表条件汇总数值 /// /// @param page 登记记录范围查询请求 diff --git a/src/main/java/com/imyeyu/api/modules/gao/service/GaoEventRecordService.java b/src/main/java/com/imyeyu/api/modules/gao/service/GaoEventRecordService.java index a798883..5c4944d 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/service/GaoEventRecordService.java +++ b/src/main/java/com/imyeyu/api/modules/gao/service/GaoEventRecordService.java @@ -117,6 +117,12 @@ public interface GaoEventRecordService extends BaseService pageByRange(GaoEventRecordPage req); + /// 按登记记录列表条件统计去重客户数量 + /// + /// @param req 登记记录范围查询请求 + /// @return 去重后的客户数量 + long countCustomerByRange(GaoEventRecordPage req); + /// 按时间范围统计门店登记数 /// /// @param req 门店报表查询请求 diff --git a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventRecordServiceImplement.java b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventRecordServiceImplement.java index f90b65c..258aa16 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventRecordServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventRecordServiceImplement.java @@ -467,6 +467,12 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService stateDailyByRange(GaoStoreChartReq req) { return mapper.stateDailyByRange(req); diff --git a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoEventRecordPageResult.java b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoEventRecordPageResult.java index eb96821..00e96e3 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoEventRecordPageResult.java +++ b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoEventRecordPageResult.java @@ -19,4 +19,8 @@ public class GaoEventRecordPageResult extends PageResult { /// 指定单个数值事件的登记数值合计,未指定单个 NUMBER 事件时为空 @JsonView(ResponseView.Public.class) private Long numberValueTotal; + + /// 查询条件下去重后的客户数量 + @JsonView(ResponseView.Public.class) + private Long customerCount; } diff --git a/src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml b/src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml index 6cfed79..b4ffdf2 100644 --- a/src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml +++ b/src/main/resources/mapper/timi-server/gao/GaoEventRecordMapper.xml @@ -167,6 +167,13 @@ ORDER BY r.`registered_at` DESC, r.`created_at` DESC LIMIT #{offset}, #{limit} +