From aa391e89bc5433832aa35043ea947c88b0f744e8 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Mon, 14 Feb 2022 09:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=9F=E6=88=B7=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=9F=AD=E4=BF=A1=E6=8F=90=E9=86=92=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java  | 6 +++---
 .../src/main/resources/mapper/XhpcTenantMapper.xml          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java
index 8fb70c98..47f66ce5 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/task/XhpcTenantTask.java
@@ -38,15 +38,15 @@ public class XhpcTenantTask {
 
 
     /**
-     * 每天一点自动清理过期租户
+     * 提前15天通知即将到期的租户
      */
     @Scheduled(cron = "0 0 14 * * ? ")
     private void ExpiringTenantSmsTask(){
 
-        String expireTime = DateUtil.formatDateTime(com.xhpc.common.util.DateUtil.addDay(new Date(), -15));
+        String expireTime = DateUtil.formatDate(com.xhpc.common.util.DateUtil.addDay(new Date(), 15));
         List<XhpcTenantDomain> expireDomainList = tenantMapper.selectExpiringList(expireTime);
         for(XhpcTenantDomain domain: expireDomainList){
-            // todo 发短信提醒
+
             if (StringUtils.isEmpty(domain.getContactNumber())){
                 continue;
             }
diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
index de7f7fd9..674e82f5 100644
--- a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
+++ b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
@@ -273,7 +273,7 @@
     select
     <include refid="Base_Column_List" />
     from xhpc_tenant
-    where is_deleted = 0 and status = 1 and expire_time is not null and expire_time <![CDATA[ <= ]]> #{expireTime}
+    where is_deleted = 0 and status = 1 and expire_time is not null and DATE_FORMAT(expire_time,'%Y-%m-%d') <![CDATA[ = ]]> #{expireTime}
   </select>
 
 </mapper>
\ No newline at end of file