diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java index f92fdadce..0d7342475 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java @@ -67,6 +67,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { int client_id = device.getIntValue("client_id"); List clientLogs = actMonDelaySettleMapper.clientLog(client_id); JSONObject res = new JSONObject(); + res.put("operation_pause",false); Boolean apply = false; if (!clientLogs.isEmpty()) { apply = true; @@ -82,6 +83,10 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService { res.put("active", true); res.put("expire", false); } + LocalDateTime dt = LocalDateTime.now(); + if(dt.getDayOfWeek()==DayOfWeek.MONDAY && dt.getHour()<18){ + res.put("operation_pause",true); + } BigDecimal total_redpack = actMonDelaySettleRedPackMapper.getTotalRedPack(client_id); PageList list = actMonDelaySettleRedPackMapper.listRedpacks(client_id, new PageBounds(Order.formString("create_time.desc"))); res.put("apply", apply); diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html index a0f0f40cf..d2350f0ff 100644 --- a/src/main/resources/templates/activity/mondelay/mondelay.html +++ b/src/main/resources/templates/activity/mondelay/mondelay.html @@ -53,8 +53,8 @@
-
@@ -87,8 +87,8 @@
-
@@ -110,7 +110,7 @@