From 1d1009b121c6821f14f0ce48760f4eb88d4d4a6e Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Fri, 11 Sep 2026 23:52:43 +0800
Subject: [PATCH] add customer list for GaoCustomerDailyStateView

---
 .../modules/gao/mapper/GaoCustomerMapper.java |  9 +++++++++
 .../GaoCustomerServiceImplement.java          |  6 ++++++
 .../vo/GaoCustomerDailyStateCustomerView.java | 20 +++++++++++++++++++
 .../gao/vo/GaoCustomerDailyStateView.java     |  5 +++++
 .../api/modules/gao/vo/GaoCustomerPage.java   |  6 ++++++
 .../timi-server/gao/GaoCustomerMapper.xml     | 19 ++++++++++++++++++
 6 files changed, 65 insertions(+)
 create mode 100644 src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateCustomerView.java

diff --git a/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoCustomerMapper.java b/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoCustomerMapper.java
index e0d1e35..c7b2f74 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoCustomerMapper.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/mapper/GaoCustomerMapper.java
@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.gao.mapper;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDiseaseTextView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
@@ -29,6 +30,14 @@ public interface GaoCustomerMapper extends BaseMapper<GaoCustomer, String> {
 	/// @return 每日新增客户数
 	List<GaoCustomerDailyStateView> stateDailyNewCustomer(@Param("storeId") String storeId, @Param("beginCreatedAt") Long beginCreatedAt, @Param("endCreatedAt") Long endCreatedAt);
 
+	/// 查询每日新增客户摘要
+	///
+	/// @param storeId 门店 ID
+	/// @param beginCreatedAt 开始创建时间
+	/// @param endCreatedAt 结束创建时间
+	/// @return 每日新增客户摘要
+	List<GaoCustomerDailyStateCustomerView> selectDailyNewCustomer(@Param("storeId") String storeId, @Param("beginCreatedAt") Long beginCreatedAt, @Param("endCreatedAt") Long endCreatedAt);
+
 	/// 统计开始时间前客户总数
 	///
 	/// @param beginCreatedAt 开始创建时间
diff --git a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
index e60a960..3634c13 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
@@ -16,6 +16,7 @@ import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
 import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
+import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
@@ -411,6 +412,10 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		for (GaoCustomerDailyStateView view : mapper.stateDailyNewCustomer(req.getStoreId(), beginCreatedAt, endCreatedAt)) {
 			newCustomerCountMap.put(view.getDateValue(), TimiJava.defaultIfNull(view.getNewCustomerCount(), 0L));
 		}
+		Map<Integer, List<GaoCustomerDailyStateCustomerView>> customerListMap = new HashMap<>();
+		for (GaoCustomerDailyStateCustomerView customer : mapper.selectDailyNewCustomer(req.getStoreId(), beginCreatedAt, endCreatedAt)) {
+			customerListMap.computeIfAbsent(customer.getDateValue(), key -> new ArrayList<>()).add(customer);
+		}
 		long totalCustomerCount = TimiJava.defaultIfNull(mapper.countCreatedBefore(req.getStoreId(), beginCreatedAt), 0L);
 		List<GaoCustomerDailyStateView> list = new ArrayList<>();
 		for (LocalDate date = beginDate; !date.isAfter(endDate); date = date.plusDays(1)) {
@@ -421,6 +426,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 			view.setDateValue(dateValue);
 			view.setNewCustomerCount(newCustomerCount);
 			view.setTotalCustomerCount(totalCustomerCount);
+			view.setCustomerList(customerListMap.getOrDefault(dateValue, List.of()));
 			list.add(view);
 		}
 		return list;
diff --git a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateCustomerView.java b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateCustomerView.java
new file mode 100644
index 0000000..71f7c6c
--- /dev/null
+++ b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateCustomerView.java
@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+///
+/// 客户每日统计中的客户摘要
+///
+/// @author Codex
+/// @since 2026-09-11
+@Data
+public class GaoCustomerDailyStateCustomerView {
+
+	/// 用于服务层按日期分组，不返回给前端
+	@JsonIgnore
+	private Integer dateValue;
+
+	/// 客户姓名
+	private String name;
+}
diff --git a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateView.java b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateView.java
index 8198c95..03f5d40 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateView.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerDailyStateView.java
@@ -2,6 +2,8 @@ package com.imyeyu.api.modules.gao.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 ///
 /// 客户每日统计视图
 ///
@@ -18,4 +20,7 @@ public class GaoCustomerDailyStateView {
 
 	/// 截止当日客户总数
 	private Long totalCustomerCount;
+
+	/// 当日新增客户列表
+	private List<GaoCustomerDailyStateCustomerView> customerList;
 }
diff --git a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPage.java b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPage.java
index e904914..1aa3345 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPage.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoCustomerPage.java
@@ -23,4 +23,10 @@ public class GaoCustomerPage extends Page<GaoCustomer> {
 
 	/// 标签 ID 列表，客户必须同时拥有列表内全部标签
 	private List<String> tagIdList;
+
+	/// 录入时间起始，包含，Unix 毫秒时间戳
+	private Long beginCreatedAt;
+
+	/// 录入时间结束，包含，Unix 毫秒时间戳
+	private Long endCreatedAt;
 }
diff --git a/src/main/resources/mapper/timi-server/gao/GaoCustomerMapper.xml b/src/main/resources/mapper/timi-server/gao/GaoCustomerMapper.xml
index 67b701d..ebbd1cf 100644
--- a/src/main/resources/mapper/timi-server/gao/GaoCustomerMapper.xml
+++ b/src/main/resources/mapper/timi-server/gao/GaoCustomerMapper.xml
@@ -49,6 +49,12 @@
 				HAVING COUNT(DISTINCT `ta`.`tag_id`) = #{tagCount}
 			)
 		</if>
+		<if test="beginCreatedAt != null">
+			AND `c`.`created_at` &gt;= #{beginCreatedAt}
+		</if>
+		<if test="endCreatedAt != null">
+			AND `c`.`created_at` &lt;= #{endCreatedAt}
+		</if>
 	</sql>
 
 	<select id="countByQuery" resultType="long">
@@ -92,6 +98,19 @@
 		ORDER BY `dateValue` ASC
 	</select>
 
+	<select id="selectDailyNewCustomer" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateCustomerView">
+		SELECT
+			`name`,
+			CAST(DATE_FORMAT(FROM_UNIXTIME(`created_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`
+		FROM `gao_customer`
+		WHERE
+			`store_id` = #{storeId}
+			AND `created_at` &gt;= #{beginCreatedAt}
+			AND `created_at` &lt;= #{endCreatedAt}
+			AND `deleted_at` IS NULL
+		ORDER BY `dateValue` ASC, `created_at` ASC, `id` ASC
+	</select>
+
 	<select id="countCreatedBefore" resultType="java.lang.Long">
 		SELECT
 			COUNT(1)