diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 4756f64bf..17be3b380 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -29,7 +29,7 @@ public interface ClientMapper { List listValidClient(); - List listValidClientFor30Days(JSONObject params); + List listValidClientFor90Days(JSONObject params); List listGreenChannel(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 10379e81e..cc488a4f4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -119,7 +119,7 @@ public class NoticeManageImpl implements NoticeManage { notice.put("create_name", manager.getString("display_name")); if (notice.getInteger("merchants_type") != 1){ StringBuilder sendClients = new StringBuilder(); - List clients = clientMapper.listValidClientFor30Days(notice); + List clients = clientMapper.listValidClientFor90Days(notice); clients.forEach(c -> { if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ String p = c.getString("client_moniker")+","; @@ -180,7 +180,7 @@ public class NoticeManageImpl implements NoticeManage { if (notice.getInteger("merchants_type") != 1){ StringBuilder sendClients = new StringBuilder(); - List clients = clientMapper.listValidClientFor30Days(notice); + List clients = clientMapper.listValidClientFor90Days(notice); clients.forEach(c -> { if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ String p = c.getString("client_moniker")+","; diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index e99c35ccf..8ea46adeb 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -7,14 +7,14 @@ WHERE is_valid = 1 and (approve_result = 1 or approve_result = 2) - SELECT DISTINCT sc.client_id, sc.client_moniker, sc.parent_client_id FROM statistics_customer_order sco, sys_clients sc, sys_client_config cc - WHERE sco.date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) + WHERE sco.date >= DATE_SUB(CURDATE(), INTERVAL 90 DAY) AND sco.client_id = sc.client_id AND sc.client_id = cc.client_id