Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

7 years ago · daae66eb96
parent d787ec14ec 89a9c1c061
commit daae66eb96
6 changed files with 15 additions and 12 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@ -444,8 +444,8 @@ public class RetailAppServiceImp implements RetailAppService {
                    date_query.setClient_ids((String[]) params.get("client_ids"));
                }
                JSONObject date_params = date_query.toParams(query.getTimezone());
-                date_params.put("begin",date_params.getDate("from"));
-                date_params.put("end",date_params.getDate("to"));
+                date_params.put("begin", date_params.getDate("from"));
+                date_params.put("end", date_params.getDate("to"));
                date_params.put("client_id", device.getIntValue("client_id"));
                JSONObject analysis = transactionAnalysisMapper.getClientTransaction(date_params);
                order.put("date_total", analysis);
@ -627,9 +627,12 @@ public class RetailAppServiceImp implements RetailAppService {

    @Override
    public void sendNoticeMessage(final NoticeInfo notice, final String[] client_monikers) {
-        sendingAppleMsgPool.execute(() -> {
-            for (String clientMoniker : client_monikers) {
-                JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
+        for (String clientMoniker : client_monikers) {
+            JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
+            if(client==null){
+                continue;
+            }
+            sendingAppleMsgPool.execute(() -> {
                List<JSONObject> tokens = clientDeviceTokenMapper.listAllTokensByClient_id(client.getIntValue("client_id"));
                if (tokens != null && tokens.size() > 0) {
                    for (JSONObject devToken : tokens) {
@ -667,8 +670,8 @@ public class RetailAppServiceImp implements RetailAppService {
                        }
                    }
                }
-            }
-        });
+            });
+        }
    }

    @Override
--- a/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html
+++ b/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html
@ -16,7 +16,7 @@
    <script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
 </head>
 <body>
-<img src="/static/images/logo640x640.jpg" style="width: 60%;display: block;margin: auto">
+<img src="/static/images/logo_new.jpg" style="width: 60%;display: block;margin: auto">
 <h3>身份绑定已完成，奖励将随后发出，敬请留意微信通知</h3>
 </body>
 </html>
--- a/src/main/resources/templates/mail/reset_password.html
+++ b/src/main/resources/templates/mail/reset_password.html
@ -10,7 +10,7 @@
                        <table class="logo" style="margin-bottom: 10px;">
                            <tbody><tr>
                                <td>
-                                    <img src="https://mpay.royalpay.com.au/static/images/logo640x640.jpg" height="100" width="100" border="0" style="display: block;">
+                                    <img src="https://mpay.royalpay.com.au/static/images/logo_new.jpg" height="100" width="100" border="0" style="display: block;">
                                </td>
                            </tr>
                            </tbody></table>
--- a/src/main/resources/templates/paynotice.html
+++ b/src/main/resources/templates/paynotice.html
@ -56,7 +56,7 @@
            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo" style="max-height: 120px;">
        </div>
        <div th:unless="${client['logo_url']}">
-            <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo" style="max-height: 120px;">
+            <img src="/static/images/logo_new.jpg" id="buslogo" class="logo" style="max-height: 120px;">
        </div>
    </div>

--- a/src/main/resources/templates/refund_status.html
+++ b/src/main/resources/templates/refund_status.html
@ -52,7 +52,7 @@
            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo">
        </div>
        <div th:if="${client.logo_url==null} or ${client.logo_url==''}">
-            <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo">
+            <img src="/static/images/logo_new.jpg" id="buslogo" class="logo">
        </div>
    </div>

--- a/src/main/ui/static/analysis/partner_card.js
+++ b/src/main/ui/static/analysis/partner_card.js
@ -37,7 +37,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                $http.get('/analysis/partner_card/' + clientMoniker + '/basic_info').then(function (resp) {
                    $scope.basicinfo = resp.data;
                    if ($scope.basicinfo.logo_url == null) {
-                        $scope.basicinfo.logo_url = "/static/images/logo640x640.jpg";
+                        $scope.basicinfo.logo_url = "/static/images/logo_new.jpg";
                    }
                });
            }