From cfb3070c49bd19290ce22d466bc6a5fe57b5931c Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Mon, 5 Mar 2018 11:56:26 +0800 Subject: [PATCH 1/2] fix --- .../core/impls/RetailAppServiceImp.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git 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 index efeb6d09a..b9fffdcff 100644 --- 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 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 From 89a9c1c0616a96a8602144e4bf6bd80dfe86dd68 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Mon, 5 Mar 2018 16:35:33 +0800 Subject: [PATCH 2/2] fix change logo --- .../templates/activity/one_dollar_day/merchant_bind.html | 2 +- src/main/resources/templates/mail/reset_password.html | 2 +- src/main/resources/templates/paynotice.html | 2 +- src/main/resources/templates/refund_status.html | 2 +- src/main/ui/static/analysis/partner_card.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html b/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html index 7be329176..92e37d9cd 100644 --- 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 @@ - +

身份绑定已完成，奖励将随后发出，敬请留意微信通知

\ No newline at end of file diff --git a/src/main/resources/templates/mail/reset_password.html b/src/main/resources/templates/mail/reset_password.html index cbc7bc56d..88f5b04f3 100644 --- a/src/main/resources/templates/mail/reset_password.html +++ b/src/main/resources/templates/mail/reset_password.html @@ -10,7 +10,7 @@ diff --git a/src/main/resources/templates/paynotice.html b/src/main/resources/templates/paynotice.html index 64d26ce80..0939a2e3f 100644 --- a/src/main/resources/templates/paynotice.html +++ b/src/main/resources/templates/paynotice.html @@ -56,7 +56,7 @@
- +
diff --git a/src/main/resources/templates/refund_status.html b/src/main/resources/templates/refund_status.html index 55084797e..7a56e0d0e 100644 --- a/src/main/resources/templates/refund_status.html +++ b/src/main/resources/templates/refund_status.html @@ -52,7 +52,7 @@
- +
diff --git a/src/main/ui/static/analysis/partner_card.js b/src/main/ui/static/analysis/partner_card.js index 2302892d7..4496d7ca8 100644 --- 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"; } }); }