From 4c7e643b59e601682efe0b3a9c38c2535a6909f7 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Tue, 22 Jan 2019 17:01:37 +0800
Subject: [PATCH] [fix]

---
 .../activities/app_index/core/AppActService.java     |  2 +-
 .../app_index/core/impls/AppActServiceImp.java       |  4 +---
 .../activities/app_index/web/AppActController.java   | 12 ++++++++++--
 src/main/ui/static/cms/templates/article_editor.html |  9 ++++++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

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<JSONObject> 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/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html
index 7c9cd1bf5..57061f8ee 100644
--- a/src/main/ui/static/cms/templates/article_editor.html
+++ b/src/main/ui/static/cms/templates/article_editor.html
@@ -24,7 +24,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label ng-if="catId!='app_activity' and catId!='app_ad" class="col-md-2 control-label" for="desc-input">HTML Description</label>
+                        <label ng-if="catId!='app_activity' && catId!='app_ad'" class="col-md-2 control-label" for="desc-input">HTML Description</label>
                         <label ng-if="catId=='app_activity'" class="col-md-2 control-label" for="desc-input">HomePage AD</label>
                         <label ng-if="catId=='app_ad'" class="col-md-2 control-label" for="desc-input">App Launch AD</label>
                         <div class="col-md-10">
@@ -61,6 +61,13 @@
                             <p ng-if="catId=='app_ad'"class="small text-warning">(广告展示时间(s))</p>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label" for="kw-input">url</label>
+                        <div class="col-md-10">
+                            <input ng-model="reference.url" type="text" name="title" id="url-input" class="form-control">
+                            <p class="small text-warning">(跳转H5页面链接)</p>
+                        </div>
+                    </div>
                 </form>
                 <div class="form-group">
                     <label class="control-label">Content</label>