diff --git a/pom.xml b/pom.xml index 9b6f4228a..15508715d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.78 + 1.3.79 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java index 43df823cd..aca4ea5e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java @@ -19,6 +19,7 @@ public class AppActBean { private String act_img; private String active_date; private String expire_date; + private String partner_black_list; public JSONObject toJsonParam(){ @@ -28,6 +29,7 @@ public class AppActBean { params.put("show_type",show_type); params.put("act_img",act_img); params.put("is_valid",is_valid); + params.put("partner_black_list", partner_black_list); if (active_date != null) { try { Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS); @@ -110,4 +112,12 @@ public class AppActBean { public void setIs_valid(boolean is_valid) { this.is_valid = is_valid; } + + public String getPartner_black_list() { + return partner_black_list; + } + + public void setPartner_black_list(String partner_black_list) { + this.partner_black_list = partner_black_list; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 84301c7bf..6a22830e3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -1584,6 +1584,13 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject latestAct = appActService.getAppActPopup(); if (latestAct != null) { + if (StringUtils.isNotBlank(latestAct.getString("partner_black_list"))) { + JSONObject client = clientManager.getClientInfo(clientId); + String[] blackList = latestAct.getString("partner_black_list").split(","); + if (client == null || Arrays.asList(blackList).contains(client.getString("client_moniker"))) { + return result; + } + } latestAct.put("id", latestAct.getString("act_id")); latestAct.put("url", latestAct.getString("act_url")); latestAct.put("title", latestAct.getString("act_name")); diff --git a/src/main/ui/static/actapp/templates/act_app_detail.html b/src/main/ui/static/actapp/templates/act_app_detail.html index 0dfdba7e5..b9ed670c9 100644 --- a/src/main/ui/static/actapp/templates/act_app_detail.html +++ b/src/main/ui/static/actapp/templates/act_app_detail.html @@ -87,6 +87,13 @@ ng-model="actDetail.act_url"> +
+ +
+