From f45b0985ea77b186a851574803529a5bdad69a20 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 09:12:47 +0800
Subject: [PATCH 1/7] [fix]

---
 src/main/ui/annual_bill.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index ad1def2e6..b1cdf78ff 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -63,7 +63,8 @@
 
             <ul class="slide2-data" style="display: inline-block; vertical-align: top;">
                 <li>2018年成交订单数</li>
-                <li id="ordersAmount">0</li>
+                <!--<li id="ordersAmount">0</li>-->
+                <li>超千万</li>
                 <li>较去年增长</li>
                 <li>
                     <span id="orderGrowRate">0</span>
@@ -88,7 +89,7 @@
             </div>
 
             <div class="slide2-wish-text">
-                您的2018业绩非凡，愿你2019百尺竿头更进一步，向更远大的目标前行。
+                接入RoyalPay跨境支付服务的商户规模不断扩大
             </div>
 
             <div class="slide2-hr">
@@ -163,7 +164,7 @@
 
             <div class="slide2-wish-text">
                 如果每笔交易都打印一张收营小票，将它们展开来可以铺满
-                <span style="color: #07DFC8">0.55</span>个悉尼歌剧院。
+                <span style="color: #07DFC8">8</span>个悉尼歌剧院。
             </div>
 
             <div class="slide2-hr">
@@ -178,7 +179,7 @@
                 </li>
                 <li>平均每一分钟就有超过</li>
                 <li>
-                    <span style="color: #07DFC8">13</span>
+                    <span style="color: #07DFC8">23</span>
                     <span>笔新交易</span>
                 </li>
                 <li style="margin-top: 20px!important">支付系统管理后台，每月商户登录超</li>
@@ -776,7 +777,8 @@
     var orderAnimObject = {
         ordersAmount: 6686645,
         orderGrowRate: 169,
-        dailyOrders: 18320
+        // dailyOrders: 18320
+        dailyOrders: 32000
     };
     var merchantNum = 16000;
 
@@ -790,7 +792,7 @@
 
     var payCountAnimObject = {
         onlineMerchant: 696,
-        monthPayCount: 96738,
+        monthPayCount: 210000,
         monthPayCountGrow: 327
     }
 

From acd366b849e62a1edcbe06099d489240ad99bd21 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 10:03:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?[fix]=E6=94=AF=E4=BB=98=E5=AE=9D=E8=B0=83?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/annual_bill.html                 | 5 +++--
 src/main/ui/static/analysis/risk_business.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index b1cdf78ff..a201c2d22 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -175,7 +175,7 @@
                 <li>2018年每月流水超</li>
                 <li>
                     <span>$</span>
-                    <span id="transactionAmount">37,425,582</span>
+                    <span id="transactionAmount">71,588,990</span>
                 </li>
                 <li>平均每一分钟就有超过</li>
                 <li>
@@ -788,7 +788,8 @@
         dailyPayedUsersNum: 2245
     };
 
-    var transactionAmount = 37425582;
+    // var transactionAmount = 37425582;
+    var transactionAmount = 71588990;
 
     var payCountAnimObject = {
         onlineMerchant: 696,
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index acd5d2223..4bc203ade 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -667,7 +667,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 $scope.warningOrderTypes = warningOrderTypesMap;
                 $scope.materials = [{key: 0, value: ""}];
                 $scope.canMinus = false;
-
+                $scope.riskEvent = {};
                 $scope.increase = function($index) {
                     $scope.materials.splice($index + 1, 0,
                              {key: new Date().getTime(), value: ""});   // 用时间戳作为每个item的key

From 992037febc0db2bce5ad98258515b1b350415cf6 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 10:07:44 +0800
Subject: [PATCH 3/7] [fix]

---
 src/main/ui/annual_bill.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index a201c2d22..f9c775ac4 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -63,8 +63,10 @@
 
             <ul class="slide2-data" style="display: inline-block; vertical-align: top;">
                 <li>2018年成交订单数</li>
-                <!--<li id="ordersAmount">0</li>-->
-                <li>超千万</li>
+                <li>
+                    <span id="ordersAmount">1168</span>万
+                </li>
+                <!--<li>超千万</li>-->
                 <li>较去年增长</li>
                 <li>
                     <span id="orderGrowRate">0</span>
@@ -775,7 +777,7 @@
 
     var numAnimTime = 1;
     var orderAnimObject = {
-        ordersAmount: 6686645,
+        ordersAmount: 1168,
         orderGrowRate: 169,
         // dailyOrders: 18320
         dailyOrders: 32000

From a10d9ce7652c5cadcf3e867403d04baaa44158d4 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 10:50:48 +0800
Subject: [PATCH 4/7] [fix]

---
 src/main/ui/annual_bill.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index f9c775ac4..86141597d 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -754,14 +754,6 @@
             <div class="slide2-wish-text" style="text-align: center; margin-top: 40px;">
                 RoyalPay作为一家无缝对接中国消费者与澳洲商家的Fintech企业,致力于提供更安全便捷的支付体验, 助力全球跨境支付业务蓬勃发展。感谢您的加入,让我们离智慧生活的新时代又近了一步！
             </div>
-
-
-            <!-- <div class="bottom">
-                <div class="bottom-text2">滑动查看2019账单</div>
-                <div class="bottom-img">
-                    <img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">
-                </div>
-            </div> -->
         </div>
     </div>
 

From 4328c7ef5f731887424286f7b4077eb19275fa4b Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 15:08:03 +0800
Subject: [PATCH 5/7] [fix]

---
 src/main/ui/annual_bill.html | 261 ++++++++++++++++++-----------------
 1 file changed, 137 insertions(+), 124 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index 86141597d..026901e6a 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -133,16 +133,26 @@
             <div style="height: 2.5rem;"></div>
 
             <ul class="slide2-data" style="margin-left: 50px; margin-right: 30px;">
-                <li>2018年通过RoyalPay完成无卡支付的用户</li>
-                <li id="payedUsersNum">819,677</li>
+                <li>2018年通过RoyalPay完成线上&线下的用户达</li>
+                <li>
+                    <!--819,677-->
+                    <span id="payedUsersNum">300</span>
+                    <span>万人</span>
+                </li>
                 <li>较去年增长</li>
                 <li>
-                    <span id="payedUsersGrowNum">142</span>
+                    <!--<span id="payedUsersGrowNum">-->
+                        <!--&lt;!&ndash;142&ndash;&gt;-->
+                        <!--321.53-->
+                    <!--</span>-->
+                    321.53
                     <span>%</span>
                 </li>
-                <li>平均每天达</li>
+                <li>平均每天超</li>
                 <li style="position: relative;">
-                    <span id="dailyPayedUsersNum">2,245</span>
+                    <span id="dailyPayedUsersNum">
+                        8,219
+                    </span>
                     <span>人</span>
                     <div style="position: absolute; width: 9rem; left: 40%; bottom: -2rem">
                         <img src="static/images/annualBill/shanghuzengz@2x.png">
@@ -176,8 +186,11 @@
             <ul class="slide2-data" style="padding-left: 45%; padding-right: 30px; padding-top: 3rem; padding-bottom: 4rem; background-image: url('static/images/annualBill/money@2x.png'); background-repeat: no-repeat; background-size: 45%; position: relative;">
                 <li>2018年每月流水超</li>
                 <li>
-                    <span>$</span>
-                    <span id="transactionAmount">71,588,990</span>
+                    <span id="transactionAmount">
+                        <!--71,588,990-->
+                        81,588,990
+                    </span>
+                    <span> AUD</span>
                 </li>
                 <li>平均每一分钟就有超过</li>
                 <li>
@@ -449,7 +462,7 @@
                 </div>
                 <div class="gateway-offline">
                     <span class="orange-dot"></span>
-                    <span class="gray-text" style="vertical-align: middle">线上支付渠道</span>
+                    <span class="gray-text" style="vertical-align: middle">线下支付渠道</span>
                 </div>
             </div>
 
@@ -619,105 +632,105 @@
         </div>
 
         <!-- 第十三屏 -->
-        <div class="swiper-slide slide2 slide13">
-            <div class="slide2-title">
-                <label>半边天慈善活动</label><br>
-                <label>排行榜</label>
-            </div>
-
-            <div class="slide2-wish-text">
-                半边天活动参与商户活动期间交易笔数TOP10
-            </div>
+        <!--<div class="swiper-slide slide2 slide13">-->
+            <!--<div class="slide2-title">-->
+                <!--<label>半边天慈善活动</label><br>-->
+                <!--<label>排行榜</label>-->
+            <!--</div>-->
 
-            <div class="slide2-hr">
-                <div class="left"></div>
-            </div>
-            <!--<div style="padding: 30px; margin-top: 30px;">-->
-                <!--<img src="static/images/annualBill/paihang.png">-->
+            <!--<div class="slide2-wish-text">-->
+                <!--半边天活动参与商户活动期间交易笔数TOP10-->
             <!--</div>-->
 
-            <div class="paihangbang">
-                <ul>
-                    <li>
-                        <label class="industry-name text-right">51GO</label>
-                        <label id="top1" class="blue-to-green" style="width: 0%;"></label>
-                        <label class="top-value">
-                            <span id="top1value">117605</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">代购之家</label>
-                        <label id="top2" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top2value">70977</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">HOMETOWN SUPERMARKET</label>
-                        <label id="top3" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top3value">64384</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">BUY@HOME</label>
-                        <label id="top4" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top4value">55873</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">HM SYD</label>
-                        <label id="top5" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top5value">47897</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">FUMAO</label>
-                        <label id="top6" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top6value">46678</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">BNE GIFT<br> STATION</label>
-                        <label id="top7" style="width: 0%;" class="blue-to-green width-transition"></label>
-                        <label class="top-value">
-                            <span id="top7value">43596</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">OZ 团团</label>
-                        <label id="top8" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top8value">42848</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">DAILY MARKET<br> 美天超市</label>
-                        <label id="top9" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top9value">40646</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">OWELEE<br> HEALTH STORE</label>
-                        <label id="top10" style="width: 0%;" class="blue-to-green width-transition"></label>
-                        <label class="top-value">
-                            <span id="top10value">38557</span>笔
-                        </label>
-                    </li>
-                </ul>
-            </div>
+            <!--<div class="slide2-hr">-->
+                <!--<div class="left"></div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;<div style="padding: 30px; margin-top: 30px;">&ndash;&gt;-->
+                <!--&lt;!&ndash;<img src="static/images/annualBill/paihang.png">&ndash;&gt;-->
+            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+
+            <!--<div class="paihangbang">-->
+                <!--<ul>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right">51GO</label>-->
+                        <!--<label id="top1" class="blue-to-green" style="width: 0%;"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top1value">117605</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">代购之家</label>-->
+                        <!--<label id="top2" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top2value">70977</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">HOMETOWN SUPERMARKET</label>-->
+                        <!--<label id="top3" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top3value">64384</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">BUY@HOME</label>-->
+                        <!--<label id="top4" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top4value">55873</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">HM SYD</label>-->
+                        <!--<label id="top5" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top5value">47897</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">FUMAO</label>-->
+                        <!--<label id="top6" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top6value">46678</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">BNE GIFT<br> STATION</label>-->
+                        <!--<label id="top7" style="width: 0%;" class="blue-to-green width-transition"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top7value">43596</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">OZ 团团</label>-->
+                        <!--<label id="top8" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top8value">42848</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">DAILY MARKET<br> 美天超市</label>-->
+                        <!--<label id="top9" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top9value">40646</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">OWELEE<br> HEALTH STORE</label>-->
+                        <!--<label id="top10" style="width: 0%;" class="blue-to-green width-transition"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top10value">38557</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                <!--</ul>-->
+            <!--</div>-->
 
-            <!-- <div class="bottom">
-                <div class="bottom-text2">滑动查看2019账单</div>
-                <div class="bottom-img">
-                    <img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">
-                </div>
-            </div> -->
-        </div>
+            <!--&lt;!&ndash; <div class="bottom">-->
+                <!--<div class="bottom-text2">滑动查看2019账单</div>-->
+                <!--<div class="bottom-img">-->
+                    <!--<img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">-->
+                <!--</div>-->
+            <!--</div> &ndash;&gt;-->
+        <!--</div>-->
 
         <!-- 第十四屏 -->
         <div class="swiper-slide">
@@ -777,13 +790,13 @@
     var merchantNum = 16000;
 
     var payedUsersAnimObject = {
-        payedUsersNum: 819667,
-        payedUsersGrowNum: 142,
-        dailyPayedUsersNum: 2245
+        payedUsersNum: 300,
+        payedUsersGrowNum: 321.53,
+        dailyPayedUsersNum: 8219
     };
 
     // var transactionAmount = 37425582;
-    var transactionAmount = 71588990;
+    var transactionAmount = 81588990;
 
     var payCountAnimObject = {
         onlineMerchant: 696,
@@ -967,7 +980,7 @@
             slideChangeTransitionEnd: function(event) {
                 var bottomText = document.getElementById('bottom-text');
                 if(this.activeIndex > 0) {
-                    bottomText.style.color = "#FFFFFF"
+                    bottomText.style.color = "#FFFFFF";
                     document.getElementById('bottom-img').src = 'static/images/annualBill/up@2x.png'
                 } else {
                     bottomText.style.color = '#1C2029';
@@ -993,7 +1006,7 @@
                         });
                     }
                 }
-                if (this.activeIndex == 14) {
+                if (this.activeIndex == 13) {
                     document.getElementById('bottom').style.display = 'none'
                 } else {
                     document.getElementById('bottom').style.display = 'block'
@@ -1108,21 +1121,21 @@
                     top9: 40646,
                     top10: 38557
                 };
-                var total = 569061;
-                if (this.activeIndex == 12) {
-
-                    for (var key in paihangbangObject) {
-                        document.getElementById(key).classList.add("width-transition");
-                        document.getElementById(key).style.width = paihangbangObject[key]/total*200 + '%';
-
-                        var topAnim = new CountUp(key + 'value', 0, paihangbangObject[key], 0, numAnimTime)
-                        topAnim.start();
-                    }
-                } else {
-                    for (var key in paihangbangObject) {
-                        document.getElementById(key).style.width = 0 + '%';
-                    }
-                }
+                // var total = 569061;
+                // if (this.activeIndex == 12) {
+                //
+                //     for (var key in paihangbangObject) {
+                //         document.getElementById(key).classList.add("width-transition");
+                //         document.getElementById(key).style.width = paihangbangObject[key]/total*200 + '%';
+                //
+                //         var topAnim = new CountUp(key + 'value', 0, paihangbangObject[key], 0, numAnimTime)
+                //         topAnim.start();
+                //     }
+                // } else {
+                //     for (var key in paihangbangObject) {
+                //         document.getElementById(key).style.width = 0 + '%';
+                //     }
+                // }
             }
         },
     });

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 6/7] [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>

From ede4ec78ad3d991ddf6790fb48b66a51acdadc84 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 24 Jan 2019 11:55:54 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/payment/TransactionMapper.java    |   2 +
 .../core/impls/TradeLogServiceImpl.java       | 173 ++++++++++--------
 .../mappers/payment/TransactionMapper.xml     |  89 ++++++++-
 3 files changed, 181 insertions(+), 83 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
index db7b1aa77..a6422e90a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
@@ -174,4 +174,6 @@ public interface TransactionMapper {
     List<JSONObject> getSettlementLogDetailList(@Param("clientOrders") List<Integer> clientOrders, @Param("client_id") int clientId);
 
     List<JSONObject> getClientOrderByTransactionTime(JSONObject params);
+
+    List<JSONObject> listTransFlowDetail(JSONObject params);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 0409db451..ef5de2650 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -70,6 +70,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -674,100 +675,112 @@ public class TradeLogServiceImpl implements TradeLogService {
     @Override
     public void exportExcel(TradeLogQuery query, JSONObject partner, HttpServletResponse resp) throws Exception {
         logger.debug("excel   The method======= exportExcel() start.......................");
-        JSONObject transFlow = listPartnerTransFlow(query, partner);
-        // JSONObject analysis = transFlow.getJSONObject("analysis");
-        if (transFlow.getJSONArray("data").size() > 0) {
+        int client_id = partner.getIntValue("client_id");
+        String timezone = partner.getJSONObject("client").getString("timezone");
+        JSONObject params = query.toParams(timezone);
+        clientManager.validateClients(client_id, params);
+        params.put("client_id", client_id);
+        List<JSONObject> logs = transactionMapper.listTransFlowDetail(params);
+
+        TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time"));
+        if (logs.size() > 0) {
             OutputStream ous = null;
-            try {
-                List<JSONObject> dataList = (List<JSONObject>) transFlow.get("data");
-                String transType;
-                JSONObject device;
-                int status;
-                resp.setContentType("application/octet-stream;");
-                resp.addHeader("Content-Disposition",
-                        "attachment; filename=" + "Merchant_Settlement_Info_" + query.getDatefrom() + "_" + query.getDateto() + ".xlsx");
-                ous = resp.getOutputStream();
-                Workbook wb = new XSSFWorkbook();
-                Font font = wb.createFont();
-                font.setBoldweight(Font.BOLDWEIGHT_BOLD);
-                font.setFontHeightInPoints((short) 10);
-                CellStyle analysisStyle = wb.createCellStyle();
-                analysisStyle.setFont(font);
-                String[] clientIds = query.getClient_ids();
-                List<String> clientIdList = new ArrayList<>();
-                clientIdList.add("ALL");
-                if (clientIds.length >= 2) {
-                    clientIdList.addAll(Arrays.asList(clientIds));
+            String transType;
+            int status;
+            HSSFWorkbook wb = new HSSFWorkbook();
+            Font font = wb.createFont();
+            font.setBoldweight(Font.BOLDWEIGHT_BOLD);
+            font.setFontHeightInPoints((short) 10);
+            CellStyle analysisStyle = wb.createCellStyle();
+            analysisStyle.setFont(font);
+            String[] clientIds = query.getClient_ids();
+            List<String> clientIdList = new ArrayList<>();
+            clientIdList.add("ALL");
+            if (clientIds.length >= 2) {
+                clientIdList.addAll(Arrays.asList(clientIds));
+            }
+            HSSFSheet sheet = null;
+            JSONObject client = null;
+            String platformCurrency = PlatformEnvironment.getEnv().getForeignCurrency();
+            for (String clientId : clientIdList) {
+                if ("ALL".equals(clientId)) {
+                    sheet = wb.createSheet(clientId);
+                } else {
+                    client = clientManager.getClientInfo(Integer.parseInt(clientId));
+                    sheet = wb.createSheet(client == null ? clientId : client.getString("client_moniker"));
                 }
-                Sheet sheet = null;
-                JSONObject client = null;
-                for (int i = 0;i < clientIdList.size();i++) {
-                    if (i == 0) {
-                        sheet = wb.createSheet("ALL");
-                    } else {
-                        client = clientManager.getClientInfo(Integer.parseInt(clientIdList.get(i)));
-                        sheet = wb.createSheet(client == null ? clientIdList.get(i) : client.getString("client_moniker"));
-                    }
-                    int rowNum = 0;
-                    Row row = sheet.createRow(rowNum);
-                    String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name", "Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount", "Exchange Rate",
-                            "Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No"};
-                    for (int j = 0; j < title.length; j++) {
-                        row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]);
-                    }
-                    String platformCurrency = PlatformEnvironment.getEnv().getForeignCurrency();
-                    for (JSONObject data : dataList) {
-                        if (!clientIdList.get(i).equals(data.getString("client_id")) && i != 0) {
-                            continue;
+                int rowNum = 0;
+                Row row = sheet.createRow(rowNum);
+                String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name", "Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount", "Exchange Rate",
+                        "Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No"};
+                for (int j = 0; j < title.length; j++) {
+                    row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]);
+                }
+                if ("ALL".equals(clientId)) {
+                    for (JSONObject log : logs) {
+                        String login_id = log.getString("login_id");
+                        if (StringUtils.isNotEmpty(login_id)) {
+                            log.put("order_detail", (StringUtils.isEmpty(log.getString("order_detail")) ? "" : login_id+":"+log.getString("order_detail")));
+                        }else{
+                            log.put("order_detail", (StringUtils.isEmpty(log.getString("order_detail")) ? "" : log.getString("order_detail")));
                         }
-                        if (i == 0) {
-                            transType = data.getString("trans_type");
-                            if (!"refund".equals(transType)) {
-                                status = data.getIntValue("status");
-                                if (status == 6)
-                                    transType = "Partly " + transType;
-                                else if (status == 7) {
-                                    transType = "Fully " + transType;
-                                }
+                        transType = log.getString("trans_type");
+                        if (!"refund".equals(transType)) {
+                            status = log.getIntValue("status");
+                            if (status == 6)
+                                transType = "Partly " + transType;
+                            else if (status == 7) {
+                                transType = "Fully " + transType;
                             }
-                            data.put("trans_type", transType);
-                            device = clientDeviceMapper.find(data.getString("order_dev_id"));
-                            if (device != null)
-                                data.put("dev_id", device.getString("client_dev_id"));
-                            scaleDecimalVal(data, "display_amount", platformCurrency);
-                            scaleDecimalVal(data, "transaction_amount", platformCurrency);
-                            scaleDecimalVal(data, "clearing_amount", platformCurrency);
                         }
+                        log.put("trans_type", transType);
+                        scaleDecimalVal(log, "display_amount", platformCurrency);
+                        scaleDecimalVal(log, "transaction_amount", platformCurrency);
+                        scaleDecimalVal(log, "clearing_amount", platformCurrency);
                         row = sheet.createRow(++rowNum);
-                        row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(data.getString("transaction_time"));
-                        row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(data.getString("client_order_id"));
-                        row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(data.getString("system_transaction_id"));
-                        row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(data.getString("client_moniker"));
-                        row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(data.getString("short_name"));
-                        row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_id"));
-                        row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(data.getString("channel"));
-                        row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(data.getString("display_amount"));
-                        row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(data.getString("transaction_amount"));
-                        row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(data.getString("currency"));
-                        row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount"));
-                        row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing")?"-":data.getBigDecimal("exchange_rate").toString());
-                        row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
-                        row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
-                        row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
-                        row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
-                        row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
+                        excelTrans(row, log);
+                    }
+                } else {
+                    List<JSONObject> logsByClientId = logs.stream().filter(log -> log.getString("client_id").equals(clientId)).collect(Collectors.toList());
+                    for (JSONObject log : logsByClientId) {
+                        row = sheet.createRow(++rowNum);
+                        excelTrans(row, log);
                     }
                 }
+            }
+            resp.setContentType("application/octet-stream;");
+            resp.addHeader("Content-Disposition",
+                    "attachment; filename=" + "Merchant_Settlement_Info_" + query.getDatefrom() + "_" + query.getDateto() + ".xls");
+            ous = resp.getOutputStream();
+            try {
                 wb.write(ous);
-                ous.flush();
-            } catch (IOException e) {
+                ous.close();
+            } catch (Exception e) {
                 e.printStackTrace();
-            } finally {
-                IOUtils.closeQuietly(ous);
             }
         }
     }
 
+    private void excelTrans(Row row, JSONObject data) {
+            row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(data.getString("transaction_time"));
+            row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(data.getString("client_order_id"));
+            row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(data.getString("system_transaction_id"));
+            row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(data.getString("client_moniker"));
+            row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(data.getString("short_name"));
+            row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_id"));
+            row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(data.getString("channel"));
+            row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(data.getString("display_amount"));
+            row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(data.getString("transaction_amount"));
+            row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(data.getString("currency"));
+            row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount"));
+            row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing")?"-":data.getBigDecimal("exchange_rate").toString());
+            row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
+            row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
+            row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
+            row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
+            row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
+    }
+
     @Override
     public void exportExcelNew(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
         logger.debug("excel   The method======= exportExcelNew() start.......................");
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 4572cdea4..23b2f5ecf 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -58,8 +58,6 @@
     <select id="listTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t.*,
         o.status,
-        c.client_moniker,
-        c.short_name,
         o.dev_id order_dev_id,
         ifnull(o.client_order_id,'--') client_order_id,
         if(t.channel='Settlement','clearing',
@@ -111,7 +109,6 @@
         FROM pmt_transactions t
         LEFT JOIN pmt_orders o ON o.order_id=t.order_id
         left join sys_customer_relation_alipay ra on ra.alipay_uid = o.customer_id
-        LEFT JOIN sys_clients c on c.client_id = t.client_id
         <where>
             <if test="client_ids!=null">
                 AND t.client_id IN
@@ -1102,4 +1099,90 @@
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
     </select>
+
+    <select id="listTransFlowDetail" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT t.*,
+        o.status,
+        c.client_moniker,
+        c.short_name,
+        d.client_dev_id,
+        o.dev_id order_dev_id,
+        ifnull(o.client_order_id,'--') client_order_id,
+        if(t.channel='Settlement','clearing',
+        if(t.transaction_type='Credit','payment','refund')) trans_type,
+        t.system_transaction_id,
+        if(t.channel='Settlement',
+        if(locate('MERCHANT',t.system_transaction_id)>0, 'Transfer to Merchant','Merchant Service Fee'),
+        if(t.system_generate=0,t.order_id,t.remark)) order_id2,
+        if(t.channel='Settlement','-',CASE t.clearing_status
+        WHEN 0 THEN 'ReadyToClear'
+        WHEN 1 THEN 'Cleared'
+        WHEN 2 THEN 'Preauthorised'
+        END) clear_status,
+        o.order_detail,o.display_amount,o.channel,o.currency,o.pre_authorization,
+        CASE o.gateway
+        WHEN 0
+        THEN 'Retail In-Store'
+        WHEN 1
+        THEN 'Retail In-Store'
+        WHEN 2
+        THEN 'QR Code'
+        WHEN 3
+        THEN 'Online API'
+        WHEN 4
+        THEN 'WeChat HTML5'
+        WHEN 5
+        THEN 'Retail API'
+        WHEN 6
+        THEN 'Retail API'
+        WHEN 7
+        THEN 'QR Code'
+        WHEN 8
+        THEN 'Mobile H5'
+        WHEN 9
+        THEN 'Third Party Gateway'
+        WHEN 10
+        THEN 'APP'
+        WHEN 12
+        THEN 'MICROAPP'
+        WHEN 13
+        THEN 'Native QR Code'
+        WHEN 14
+        THEN 'Share Link'
+        END AS gateway,
+        CASE o.channel
+        WHEN 'Alipay' THEN ra.login_id
+        WHEN 'AlipayOnline' THEN ra.login_email
+        END login_id
+        FROM pmt_transactions t
+        LEFT JOIN pmt_orders o ON o.order_id=t.order_id
+        left join sys_customer_relation_alipay ra on ra.alipay_uid = o.customer_id
+        LEFT JOIN sys_clients c on c.client_id = t.client_id
+        LEFT JOIN sys_clients_devices d on d.dev_id = o.dev_id
+        <where>
+            <if test="client_ids!=null">
+                AND t.client_id IN
+                <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                    #{client_id}
+                </foreach>
+            </if>
+            <if test="client_ids==null">
+                and t.client_id=#{client_id}
+            </if>
+            <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
+            <if test="to!=null">and t.transaction_time &lt; #{to}</if>
+            <if test="transaction_type!=null">and t.transaction_type=#{transaction_type}</if>
+            <if test="date!=null">and date(t.transaction_time)=date(#{date})</if>
+            <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
+            <if test="trans_type==1">and t.transaction_type = 'Credit'</if>
+            <if test="trans_type==2">and t.refund_id is NOT NULL</if>
+            <if test="trans_type==3">and t.transaction_type='Debit' and t.refund_id is NULL</if>
+            <if test="channel!=null">
+                and
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+                </foreach>
+            </if>
+        </where>
+        order by t.transaction_time desc
+    </select>
 </mapper>