diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/ActAppShowPlaceEnum.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/ActAppShowPlaceEnum.java new file mode 100644 index 000000000..1624e71b3 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/ActAppShowPlaceEnum.java @@ -0,0 +1,23 @@ +package au.com.royalpay.payment.manage.activities.app_index.beans; + +/** + * Created by yuan on 2018/3/23. + */ +public enum ActAppShowPlaceEnum { + App(1), + Banner(10), + List(100); + private int place; + + private ActAppShowPlaceEnum(int placeValue) { + this.place = placeValue; + } + + public int getPlace() { + return this.place; + } + + public boolean hasPlace(int placeValue) { + return (this.place & placeValue) > 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 6ed065c33..e02e98e0f 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 @@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.activities.app_index.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.time.DateUtils; @@ -30,6 +31,9 @@ public class AppActBean { private String msg_start_date; private String msg_end_date; private String msg_interval; + private boolean app; + private boolean banner; + private boolean list; public JSONObject toJsonParam(){ @@ -48,6 +52,17 @@ public class AppActBean { params.put("is_valid",is_valid); params.put("msg_start_date", msg_start_date); params.put("msg_end_date", msg_end_date); + int show_place = 0; + if (app) { + show_place |= ActAppShowPlaceEnum.App.getPlace(); + } + if (banner) { + show_place |= ActAppShowPlaceEnum.Banner.getPlace(); + } + if (list) { + show_place |= ActAppShowPlaceEnum.List.getPlace(); + } + params.put("show_place", show_place); if (active_date != null) { try { Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS); @@ -210,4 +225,28 @@ public class AppActBean { public void setMsg_interval(String msg_interval) { this.msg_interval = msg_interval; } + + public boolean isApp() { + return app; + } + + public void setApp(boolean app) { + this.app = app; + } + + public boolean isBanner() { + return banner; + } + + public void setBanner(boolean banner) { + this.banner = banner; + } + + public boolean isList() { + return list; + } + + public void setList(boolean list) { + this.list = list; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java index 741f07747..92f7a00cb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java @@ -1,5 +1,6 @@ package au.com.royalpay.payment.manage.activities.app_index.core.impls; +import au.com.royalpay.payment.manage.activities.app_index.beans.ActAppShowPlaceEnum; import au.com.royalpay.payment.manage.activities.app_index.beans.AppActBean; import au.com.royalpay.payment.manage.activities.app_index.beans.AppActQueryBean; import au.com.royalpay.payment.manage.activities.app_index.core.AppActService; @@ -42,7 +43,12 @@ public class AppActServiceImp implements AppActService { @Override public JSONObject getActDetail(JSONObject manager, String act_id) { - return actAppMapper.getActDetail(act_id); + JSONObject appAct = actAppMapper.getActDetail(act_id); + int show_place = appAct.getIntValue("show_place"); + appAct.put("app", ActAppShowPlaceEnum.App.hasPlace(show_place)); + appAct.put("banner", ActAppShowPlaceEnum.Banner.hasPlace(show_place)); + appAct.put("list", ActAppShowPlaceEnum.List.hasPlace(show_place)); + return appAct; } @Override 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 9e38d9e32..5c2713757 100644 --- a/src/main/ui/static/actapp/templates/act_app_detail.html +++ b/src/main/ui/static/actapp/templates/act_app_detail.html @@ -138,6 +138,26 @@ +
+ +
+
+

+ + + +

+
+
+
+ +
diff --git a/src/main/ui/static/actapp/templates/act_app_list.html b/src/main/ui/static/actapp/templates/act_app_list.html index a73892d5c..ba75a94fb 100644 --- a/src/main/ui/static/actapp/templates/act_app_list.html +++ b/src/main/ui/static/actapp/templates/act_app_list.html @@ -49,8 +49,8 @@ - - + +