diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java index 08e8032da..c79bfbb4b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java @@ -23,5 +23,5 @@ public interface AppActService { void published(JSONObject manager,String act_id,boolean is_valid); - void sendAnnualBillMessage(); + void sendAnnualBillMessage(JSONObject params); } 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 bc30022fd..90b824470 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 @@ -119,11 +119,9 @@ public class AppActServiceImp implements AppActService { } @Override - public void sendAnnualBillMessage() { + public void sendAnnualBillMessage(JSONObject params) { logger.debug("sendAnnualMessage Begin"); - JSONObject params = new JSONObject(); - params.put("client_id", 9); List tokens = clientDeviceTokenMapper.listAllTokens(params); for (JSONObject devToken : tokens) { Runnable task = () -> { diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java index e23be209f..c104c4694 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java @@ -46,9 +46,17 @@ public class AppActController { appActService.published(manager,act_id,is_valid); } - @GetMapping(value = "/annual/bill") + @GetMapping(value = "/annual/bill/test") + public String testSendAnnualBillMessage() { + JSONObject params = new JSONObject(); + params.put("client_id", 9); + appActService.sendAnnualBillMessage(params); + return "success"; + } + + @GetMapping(value = "/annual/bill/all") public String sendAnnualBillMessage() { - appActService.sendAnnualBillMessage(); + appActService.sendAnnualBillMessage(null); return "success"; } } diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html index f9c775ac4..026901e6a 100644 --- a/src/main/ui/annual_bill.html +++ b/src/main/ui/annual_bill.html @@ -133,16 +133,26 @@