diff --git a/pom.xml b/pom.xml
index c7438fbd4..a1e8c8032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.0.24
+ 1.0.25
UTF-8
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 df5996629..d5d58734c 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
@@ -26,6 +26,8 @@ public interface ClientMapper {
List listValidClient();
+ List listValidClientFor30Days();
+
List listGreenChannel(JSONObject params);
@AutoSql(type = SqlType.SELECT)
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 4b76f34ab..65e7f0769 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
@@ -108,7 +108,7 @@ public class NoticeManageImpl implements NoticeManage {
notice.put("create_name", manager.getString("display_name"));
if (!notice.getBoolean("merchants_type")){
StringBuilder sendClients = new StringBuilder();
- List clients = clientMapper.listValidClient();
+ List clients = clientMapper.listValidClientFor30Days();
clients.forEach(c -> {
if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
String p = c.getString("client_moniker")+",";
@@ -146,7 +146,7 @@ public class NoticeManageImpl implements NoticeManage {
if (!notice.getBoolean("merchants_type")){
StringBuilder sendClients = new StringBuilder();
- List clients = clientMapper.listValidClient();
+ List clients = clientMapper.listValidClientFor30Days();
clients.forEach(c -> {
if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
String p = c.getString("client_moniker")+",";
@@ -292,8 +292,7 @@ public class NoticeManageImpl implements NoticeManage {
public int listNoticeClients(String noticeId) {
JSONObject params = new JSONObject();
params.put("notice_id", noticeId);
- int clients = noticePartnerMapper.countClientsByNoticeId(params);
- return clients;
+ return noticePartnerMapper.countClientsByNoticeId(params);
}
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 2835f44e2..cd0e4c957 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
@@ -5,6 +5,17 @@
SELECT client_id,client_moniker,parent_client_id FROM sys_clients
WHERE is_valid=1 and (approve_result = 1 or approve_result = 2)
+