From 9b00b34a683d4f0d3cd9f8782185d12a79805479 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 21 May 2025 17:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=88=A0=E9=99=A4=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E8=B4=AD=E4=B9=B0=E4=BA=86=E7=9A=84=E4=BA=BA=E8=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ycwl/basic/mapper/FaceMapper.java | 2 +-
 src/main/java/com/ycwl/basic/task/FaceCleaner.java  | 3 +--
 src/main/resources/mapper/FaceMapper.xml            | 9 +++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java
index 51331ff..32ab42e 100644
--- a/src/main/java/com/ycwl/basic/mapper/FaceMapper.java
+++ b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java
@@ -36,5 +36,5 @@ public interface FaceMapper {
 
     List<FaceRespVO> listByScenicAndUserId(String scenicId, Long userId);
 
-    List<FaceEntity> listEntityBeforeDate(Long scenicId, Date endDate);
+    List<FaceEntity> listUnpaidEntityBeforeDate(Long scenicId, Date endDate);
 }
diff --git a/src/main/java/com/ycwl/basic/task/FaceCleaner.java b/src/main/java/com/ycwl/basic/task/FaceCleaner.java
index 98d0543..d7bc6b7 100644
--- a/src/main/java/com/ycwl/basic/task/FaceCleaner.java
+++ b/src/main/java/com/ycwl/basic/task/FaceCleaner.java
@@ -11,7 +11,6 @@ import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.mapper.VideoMapper;
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
-import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
 import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;
 import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
@@ -107,7 +106,7 @@ public class FaceCleaner {
             FaceReqQuery req = new FaceReqQuery();
             req.setScenicId(scenic.getId());
             Date faceEndDate = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -faceStoreDay);
-            List<FaceEntity> list = faceMapper.listEntityBeforeDate(scenic.getId(), faceEndDate);
+            List<FaceEntity> list = faceMapper.listUnpaidEntityBeforeDate(scenic.getId(), faceEndDate);
             list.forEach(face -> {
                 boolean result = adapter.deleteFace(USER_FACE_DB_NAME+face.getScenicId(), face.getId().toString());
                 if (result) {
diff --git a/src/main/resources/mapper/FaceMapper.xml b/src/main/resources/mapper/FaceMapper.xml
index 8b33258..f6c37c5 100644
--- a/src/main/resources/mapper/FaceMapper.xml
+++ b/src/main/resources/mapper/FaceMapper.xml
@@ -123,7 +123,12 @@
     <select id="test" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
         SELECT * FROM `zt`.`face_sample` WHERE `scenic_id` = '3930324797233434624' AND `create_at` &lt; '2025-03-07 14:40:36' AND `device_id` = '3961959104355897344'
     </select>
-    <select id="listEntityBeforeDate" resultType="com.ycwl.basic.model.pc.face.entity.FaceEntity">
-        SELECT * FROM `zt`.`face` WHERE `scenic_id` = #{scenicId} AND `create_at` &lt; #{endDate}
+    <select id="listUnpaidEntityBeforeDate" resultType="com.ycwl.basic.model.pc.face.entity.FaceEntity">
+        SELECT *
+        FROM `zt`.`face`
+        WHERE `scenic_id` = #{scenicId}
+          AND `create_at` &lt; #{endDate}
+          and `id` not in (select face_id from member_source where is_buy = 1)
+          and `id` not in (select face_id from member_video where is_buy = 1)
     </select>
 </mapper>