From 58a954eebea31ece42550721a2be8a3c330d515c Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 30 Apr 2020 12:03:36 +0800 Subject: [PATCH 1/7] fix --- src/main/ui/static/payment/partner/partner-manage.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 86e1bcfa6..4b767c770 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3849,7 +3849,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.applicationFileProgress; - $scope.file.upay_application_form = resp.data.url; $scope.uploadFile.upay_application_form = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3873,7 +3872,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.bankFileProgress; - $scope.file.client_bank_file = resp.data.url; $scope.uploadFile.client_bank_file = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3897,7 +3895,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.ASICProgress; - $scope.file.client_company_file = resp.data.url; $scope.uploadFile.client_company_file = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3921,7 +3918,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.idProgress; - $scope.file.upay_driver_license = resp.data.url; $scope.uploadFile.upay_driver_license = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3945,7 +3941,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.residenceFileProgress; - $scope.file.kyc_utility_bill_file = resp.data.url; $scope.uploadFile.kyc_utility_bill_file = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3969,7 +3964,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.refundPolicyFileProgress; - $scope.file.refund_exchange_policy = resp.data.url; $scope.uploadFile.refund_exchange_policy = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -3993,7 +3987,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.privacyFileProgress; - $scope.file.upay_privacy_policy = resp.data.url; $scope.uploadFile.upay_privacy_policy = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -4017,7 +4010,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.cardFileProgress; - $scope.file.card_security_policy = resp.data.url; $scope.uploadFile.card_security_policy = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -4041,7 +4033,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.letterFileProgress; - $scope.file.upay_offer_letter = resp.data.url; $scope.uploadFile.upay_offer_letter = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -4065,7 +4056,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.promotionalFileProgress; - $scope.file.upay_promotional_offer = resp.data.url; $scope.uploadFile.upay_promotional_offer = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -4089,7 +4079,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.termsFileProgress; - $scope.file.upay_terms_conditions = resp.data.url; $scope.uploadFile.upay_terms_conditions = resp.data.url; $scope.updateFile(); }, function (resp) { @@ -4113,7 +4102,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }).then(function (resp) { $scope.uploadFile = {}; delete $scope.descFileProgress; - $scope.file.upay_desc_file = resp.data.url; $scope.uploadFile.upay_desc_file = resp.data.url; $scope.updateFile(); }, function (resp) { From 4b59cf44e094c5ab31adf788c677bf9a746f130e Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 30 Apr 2020 13:25:41 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix=20bd=20kpi=20=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../bdprize/core/impls/BDPrizeServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 925a87734..13c37ea00 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.2.20 + 2.2.21 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 786156343..d1b4c31f3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -468,12 +468,12 @@ public class BDPrizeServiceImpl implements BDPrizeService { financialBDCommissionConfigMapper.updateCommissionConfig(config); } else { String[] firLasDay = getMonthFisrtLastDay(month); - config.put("START_DATE", firLasDay[0]); - config.put("END_DATE", firLasDay[1]); - config.put("CREATION_DATE", new Date()); - config.put("CREATION_BY", manager.getString("display_name")); - config.put("LAST_UPDATE_DATE", new Date()); - config.put("LAST_UPDATE_BY", manager.getString("display_name")); + config.put("start_date", firLasDay[0]); + config.put("end_date", firLasDay[1]); + config.put("creation_date", new Date()); + config.put("creation_by", manager.getString("display_name")); + config.put("last_update_date", new Date()); + config.put("last_update_by", manager.getString("display_name")); financialBDCommissionConfigMapper.insertCommissionConfig(config); } } From 668d0ca87d2560e95650142417ee12b7d3a34cdf Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 30 Apr 2020 13:27:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix=20bd=20kpi=20=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index d1b4c31f3..24cb9145d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -463,8 +463,8 @@ public class BDPrizeServiceImpl implements BDPrizeService { } if (config.getString("bc_config_id") != null && !"".equals(config.getString("bc_config_id"))) { - config.put("LAST_UPDATE_DATE", new Date()); - config.put("LAST_UPDATE_BY", manager.getString("display_name")); + config.put("last_update_date", new Date()); + config.put("last_update_by", manager.getString("display_name")); financialBDCommissionConfigMapper.updateCommissionConfig(config); } else { String[] firLasDay = getMonthFisrtLastDay(month); From 74bfd1dff039b490ab8322465b2afa0158d8bc37 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 30 Apr 2020 13:50:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix=20=E4=B8=8A=E4=BC=A0=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8E=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner-manage.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 4b767c770..d007f252c 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -147,6 +147,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter controller: 'partnerDeviceCtrl' }).state('partners.detail.files', { url: '/files', + params:{commitType:"cross-border"}, templateUrl: '/static/payment/partner/templates/partner_auth_files.html', controller: 'partnerAuthFileCtrl' }).state('partners.detail.files.CP_files', { @@ -3532,7 +3533,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.listRedpackLogs(1); }]); app.controller('partnerAuthFileCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', function ($scope, $http, $rootScope, commonDialog, $state) { - if ($scope.partner.client_type=='card-payment'){ + if ($state.params.commitType=='card-payment'){ $state.go('partners.detail.files.MW_files'); }else { $state.go('partners.detail.files.CP_files'); @@ -4148,7 +4149,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter content: 'Upload Successful', type: 'success' }); - $state.go('partners.detail.files.MW_files', {reload: true}); + $state.go('partners.detail.files',{clientMoniker:$scope.partner.client_moniker, + commitType: "card-payment"}, {reload: true}); }, function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }) From 79d249de95fafcd2d47047e89b26e23659a8485d Mon Sep 17 00:00:00 2001 From: dulingling Date: Thu, 30 Apr 2020 13:51:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Upd=EF=BC=9A=E4=BF=A1=E7=94=A8=E5=8D=A1?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/impls/RetailAppServiceImp.java | 4 + .../manage/mappers/system/ClientMapper.xml | 13 +- .../static/payment/partner/partner-manage.js | 20 +- .../templates/partner_cp_auth_files.html | 198 +++++++++--------- .../partner/templates/partner_detail.html | 9 +- .../payment/partner/templates/partners.html | 21 +- 7 files changed, 159 insertions(+), 108 deletions(-) diff --git a/pom.xml b/pom.xml index 13c37ea00..3b5d2b819 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.2.21 + 2.2.22 UTF-8 1.8.0 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 9ca43cbfb..e027041ff 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 @@ -3115,6 +3115,10 @@ public class RetailAppServiceImp implements RetailAppService { if (cbBankPay.containsKey("channel")) { channels.add(cbBankPay); } + JSONObject cardPaymentPay = getChannel(clientId, now, "rpaypmt_card"); + if (cardPaymentPay.containsKey("channel")) { + channels.add(cardPaymentPay); + } res.put("channels", channels); if (res.containsKey("rate_value")) { BigDecimal minRate = res.getBigDecimal("rate_value").add(new BigDecimal(0.01)).setScale(2, RoundingMode.DOWN); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index b752401ef..512b90b4b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -513,13 +513,24 @@ SELECT sum(if(((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or c.open_status=1 or c.open_status=2 or c.open_status=4),1,0)) wp, + + sum(if(((scup.upay_approve_result=4 and scup.upay_open_status is null) or (scup.upay_approve_result=3 and scup.upay_open_status is null) or + scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4),1,0)) cwp, + sum(if(c.approve_result is null and c.source= 4,1,0)) a_unagree, sum(if(((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or c.open_status=1 or c.open_status=2 or c.open_status=4) and c.source = 4,1,0)) a_wp, + + sum(if(((scup.upay_approve_result=4 and scup.upay_open_status is null) or + scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4) and c.source = 4,1,0)) a_cwp, + sum(if(c.approve_result=2 and c.source = 4,1,0)) wa, sum(if(c.approve_result=1,1,0)) pass, + sum(if(scup.upay_approve_result=1,1,0)) upass, sum(if(c.approve_result=1 and c.source=2,1,0)) z_pass, + sum(if(scup.upay_approve_result=1 and c.source=2,1,0)) z_upass, sum(if(c.approve_result=1 and c.source = 4,1,0)) a_pass, + sum(if(scup.upay_approve_result=1 and c.source = 4,1,0)) a_upass, sum(if(c.approve_result=0,1,0)) not_pass, sum(if(c.source=4,1,0)) quick_pass @@ -527,7 +538,7 @@ FROM sys_clients c left join sys_client_config scc on scc.client_id = c.client_id - + left join sys_client_upay_profile scup on c.client_id = scup.client_id where c.is_valid = 1 - - - - - - - -
- -
- - - - - -
-
-
- -
-
- -
-
-
-
- -
-
- {{file.id_type}} -
-
-
-
- -
- - - - - -
-
-
- -
-
- -
-
-
- - -
- - -
-
@@ -136,8 +39,6 @@ - -
@@ -198,6 +99,7 @@ ngf-select="uploadIDFile($file)"> Upload +
@@ -233,6 +135,102 @@
+
+

+ ID描述信息 +

+
+
+
+ +
+
+ +
+
+
+
+ +
+ + + + + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ {{file.id_type}} +
+
+
+
+ +
+ + + + + +
+
+
+ +
+
+ +
+
+
+
+
+
+ + +
+
+
@@ -356,6 +354,8 @@
+ +
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 2b29d3961..49fd981c6 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -289,6 +289,12 @@ Notify BD +
+ +
@@ -346,8 +352,7 @@ type="button" ng-href="{{promotionalOfferFileManager.promotional_offer_file}}" target="_blank"> 下载Promotional Offer合同
- +