From 0679f626cefe5b6edde9788ff1b2a44e3464bd02 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 7 Sep 2018 10:00:46 +0800 Subject: [PATCH 1/5] fix clearing --- src/main/ui/static/analysis/clearing-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 4ee3f2e49..cb1429ab3 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -283,7 +283,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func $scope.packup = function(key) { $scope.endIndexMap[key] = $scope.initEndIndex; - var length = $scope.clientsMap[key]; + var length = $scope.clientsMap[key].clients; if (length <= $scope.initEndIndex) $scope.endIndexMap[key] = length; }; From 01d5c6129dee507e900d6486faf6f51d4615a8ba Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 7 Sep 2018 10:35:05 +0800 Subject: [PATCH 2/5] log --- .../analysis/core/impls/EstimateAnalysisServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java index 1fedfab93..2dc8f4195 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java @@ -154,6 +154,7 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); //T1 ok JSONObject dayInfo = new JSONObject(); + dayInfo.put("platformGetSettleFee", BigDecimal.ZERO); String endStr = DateFormatUtils.format(date, "yyyy/MM/dd"); JSONObject maxDays = estimateAnalysisMapper.findMaxCleanDays(endStr); String end_date = maxDays.getString("date_str"); @@ -172,9 +173,10 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { } List alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline"); + logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString()); for (JSONObject logs : alipayOnlineSettleLogs) { dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); - dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); + dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); } cleanDays.clear(); From 24b286198c49afa84cf8a8e7937cd238bea504cd Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 7 Sep 2018 10:49:24 +0800 Subject: [PATCH 3/5] update --- .../clearing/core/impl/CleanServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 28229651f..c99cf7636 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -29,6 +29,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.defines.TradeType; import au.com.royalpay.payment.tools.env.PlatformEnvironment; +import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; @@ -153,6 +154,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider private SpringTemplateEngine thymeleaf; @Resource private ClientConfigService clientConfigService; + @Resource + private SysConfigManager sysConfigManager; @Value("${app.settlement.email-to}") private String settlementEmailTo; @@ -969,11 +972,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd"); JSONObject model = new JSONObject(); model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy")); - // todo themeleaf - - - // final String content = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, - // "mail/settlement_mail.vm", "utf-8", model); String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd"); List attachList = new ArrayList<>(); JSONObject attach1 = new JSONObject(); @@ -1017,9 +1015,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider // 测试用地址 // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content, // attachList); - String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com", - "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,ben.evans@royalpay.com.au", - content, attachList); + JSONObject config = sysConfigManager.getSysConfig(); + String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"),config.getString("settle_mail_cc"), content, attachList); if (settleMail == null) { JSONObject settleMailRecord = new JSONObject(); From 8e65c89875214662b8456abbd103ffa1c672d881 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 7 Sep 2018 10:52:24 +0800 Subject: [PATCH 4/5] maven --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 351b5ceee..fcc8224a2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 From 384475da74ef456b819e14c50145de03dd925c92 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 7 Sep 2018 14:22:32 +0800 Subject: [PATCH 5/5] add partnerInfo - copy icon --- .../static/payment/partner/partner-manage.js | 10 +++++++ src/main/ui/static/payment/partner/partner.js | 12 +++++++++ .../templates/client_payment_info.html | 27 +++++++++++-------- .../templates/partner_payment_info.html | 2 ++ 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 51dcb649d..8aced4d4e 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1195,6 +1195,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }]); app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) { $scope.refresh = false; + $scope.copyHfLink = function() { + var e=document.getElementById("cpbt"); + e.select(); + var successful = document.execCommand("Copy"); + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}); + }else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}); + } + }; $scope.loadPartnerPaymentInfo = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { $scope.paymentInfo = resp.data; diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 9e5a7e7d8..12fe7c3ce 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -557,6 +557,18 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct $scope.paymentInfo = $scope.partner; $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate); $scope.qrConfig = {currency: 'AUD'}; + + $scope.clientCopyHfLink = function() { + var e=document.getElementById("c-cpbt"); + e.select(); + var successful = document.execCommand("Copy"); + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}); + }else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}); + } + }; + $scope.reloadQRCode = function () { $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) { $scope.qrcode = resp.data; diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index d9be1de43..98b914b06 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -102,9 +102,11 @@
- -

{{partner.hf_pay_url}} - + + {{partner.hf_pay_url}} + + + + + +

-
- - -
- 仅支持微信客户端扫描
-
+
+ + +
+ 仅支持微信客户端扫描 +
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index bba78c0c4..e4a502704 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -329,6 +329,8 @@
  {{paymentInfo.hf_pay_url}} + +