From a779b081a6f8b13572998cd8b70ea2f408956358 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 11:35:16 +0800 Subject: [PATCH 01/13] ui update --- src/main/ui/static/analysis/clearing-log.js | 1 + .../analysis/templates/settlement_detail.html | 36 +- src/main/ui/static/css/common.css | 366 +++++++++--------- src/main/ui/static/images/bank/ANZ.png | Bin 0 -> 7342 bytes src/main/ui/static/images/bank/CBA.png | Bin 0 -> 1662 bytes 5 files changed, 200 insertions(+), 203 deletions(-) create mode 100644 src/main/ui/static/images/bank/ANZ.png create mode 100644 src/main/ui/static/images/bank/CBA.png diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 1eb5e5a0c..944faa786 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -249,6 +249,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func $scope.noticeResend = false; $scope.analysisFilter = {}; $scope.currentAnalysis = $scope.detail; + $scope.pageCtrl = {visible:{}}; function getAnalysisTemplate() { return [ diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 44c02d21a..5157836b1 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -70,7 +70,8 @@ - @@ -137,22 +138,6 @@ - -
-
-
    -
  • -
    - T+{{group.settleDays}} - - Clients:{{group.clients}}, Amount:{{group.settleAmount|currency:''}} - -
    -
    • -
-
-
    @@ -170,16 +155,17 @@
-
-
T+{{group.settleDays}}: Clients:{{group.clients}} +
+ T+{{group.settleDays}}: Clients:{{group.clients}} Amount:{{group.settleAmount|currency:''}} + Click to hide
-
- +
+
- @@ -193,8 +179,10 @@ - - + + @@ -47,12 +59,19 @@ + From 48d2d7b58efee1e75cd512f9ab66cdc89962debb Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 15:59:46 +0800 Subject: [PATCH 06/13] fix app settlement log --- .../payment/manage/appclient/core/impls/RetailAppServiceImp.java | 1 + 1 file changed, 1 insertion(+) 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 447419470..b2fc46451 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 @@ -554,6 +554,7 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); } } } From 9ddfe7ef1f93a332481d9d585469ceeead15154b Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Jun 2018 16:01:08 +0800 Subject: [PATCH 07/13] add hf --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4c7992c26..a5ac9569e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -68,7 +68,7 @@ app.cms.host=https://www.royalpay.com.au/ app.server.ip=127.0.0.1 app.redpack_auth.enable=false - +hf.rsa-file=/opt/2000604000101.pfx ##积分商城 app.customer.host=https://customer.royalpay.com.au/ customer.app.appid=customer From 4b79f3fe6061780cec919ba6f31f350c6054c35a Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 17:08:18 +0800 Subject: [PATCH 08/13] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b2fc46451..a2aacba36 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 @@ -552,7 +552,8 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); if (clearingDetail!=null){ JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); - if(clearingLog.getBooleanValue("editable")){ + if(clearingLog.getBoolean("editable")){ + logger.info("###editable:"+clearingLog.getBoolean("editable")); result.put("padding", true); logs.get(0).put("padding",true); } From 9c5e11b7ebeba4271d1667ee4f8c1775c57a2b2d Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 17:28:11 +0800 Subject: [PATCH 09/13] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 6 +----- .../manage/merchants/core/impls/ClientManagerImpl.java | 2 ++ .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 2 ++ 3 files changed, 5 insertions(+), 5 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 a2aacba36..79313cba0 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 @@ -549,15 +549,11 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject result = PageListUtils.buildPageListResult(logs); if (appQueryBean.getPage() == 1) { if (!logs.isEmpty() && logs.size() > 0) { - JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); - if (clearingDetail!=null){ - JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); + JSONObject clearingLog = clearingLogMapper.findById(logs.get(0).getIntValue("clearing_id")); if(clearingLog.getBoolean("editable")){ - logger.info("###editable:"+clearingLog.getBoolean("editable")); result.put("padding", true); logs.get(0).put("padding",true); } - } } } return result; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 59268e5e0..ba11193c2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -2658,6 +2658,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } 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 cdd48cdaa..73b5b4929 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 @@ -838,6 +838,8 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } From fc744e9f0c55d0ea25aeba669c846fcc33d4aecc Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Jun 2018 18:29:39 +0800 Subject: [PATCH 10/13] add hf --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7dd78e36..f66157d48 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 @@ -28,6 +28,10 @@ au.com.royalpay.payment alipay-core + + au.com.royalpay.payment + hf-core + au.com.royalpay.payment jd-core From b164e32641037b90d7fd5348c6ef5cf9438edf6c Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 28 Jun 2018 09:30:50 +0800 Subject: [PATCH 11/13] fix --- src/db/modify.sql | 5 +- src/main/ui/static/citypartner/citypartner.js | 2 +- .../static/payment/partner/partner-apply.js | 129 ----------------- .../ui/static/payment/partner/simple-apply.js | 134 ++++++++++++++++++ .../partner/templates/partners_apply.html | 6 +- .../templates/simple_applications.html | 10 +- 6 files changed, 149 insertions(+), 137 deletions(-) create mode 100644 src/main/ui/static/payment/partner/simple-apply.js diff --git a/src/db/modify.sql b/src/db/modify.sql index c4461a130..177c8ce98 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -594,4 +594,7 @@ CREATE TABLE `pre_apply_handle_log` ( PRIMARY KEY (`id`), KEY `client_id` (`client_id`) USING BTREE, KEY `client_pre_apply_id` (`client_pre_apply_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +ALTER TABLE `sys_client_pre_apply` +ADD COLUMN `status` tinyint(2) NULL DEFAULT 0 COMMENT '0:未处理，1：处理中，2：处理完成'; \ No newline at end of file diff --git a/src/main/ui/static/citypartner/citypartner.js b/src/main/ui/static/citypartner/citypartner.js index 6dae27558..fd3504804 100644 --- a/src/main/ui/static/citypartner/citypartner.js +++ b/src/main/ui/static/citypartner/citypartner.js @@ -5,7 +5,7 @@ define(['angular'], function (angular) { 'use strict'; var app = angular.module('citypartner', ['ui.router']); app.config(['$stateProvider', function ($stateProvider) { - $stateProvider.state('citypartner_reg', { + $stateProvider.state('partner_apply.citypartner_reg', { url: '/citypartner_registries', templateUrl: '/static/citypartner/templates/citypartner_registers.html', controller: 'citypartnerRegisterListCtrl' diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js index 3531d7fb7..c936abe44 100644 --- a/src/main/ui/static/payment/partner/partner-apply.js +++ b/src/main/ui/static/payment/partner/partner-apply.js @@ -19,27 +19,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS return $http.get('/partners/application/' + $stateParams.client_apply_id); }] } - }).state('partner_apply.simple_application', { - url: '/simple/applications', - templateUrl: '/static/payment/partner/templates/simple_applications.html', - controller: 'simpleApplicationListCtrl', - data: {label: '商户自主申请列表'} - }).state('partner_apply.apply_detail', { - url: '/{client_pre_apply_id}/{status}/detail', - templateUrl: '/static/payment/partner/templates/simple_application_detail.html', - controller: 'simpleApplicationDetailCtrl', - resolve: { - client_pre_apply_id: ['$stateParams', function ($stateParams) { - return $stateParams.client_pre_apply_id; - }], - status: ['$stateParams', function ($stateParams) { - return $stateParams.status; - }] - } - }).state('partner_apply.citypartner_reg', { - url: '/citypartner_registries', - templateUrl: '/static/citypartner/templates/citypartner_registers.html', - controller: 'citypartnerRegisterListCtrl' }) }]); app.controller('partnerApplyCtrl', ['$rootScope','$state', function ($rootScope,$state) { @@ -228,114 +207,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }]); - app.controller('simpleApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', - function ($scope, $state, $http, $uibModal, commonDialog) { - $scope.pagination = {}; - $scope.params = {}; - $scope.removeStatus = function () { - if($scope.params.status){ - delete $scope.params.status; - } - }; - $scope.loadSimpleApplies = function (page) { - var params = angular.copy($scope.params); - params.page = page || $scope.pagination.page || 1; - $http.get('/register/manage', {params: params}).then(function (resp) { - $scope.applies = resp.data.data; - $scope.pagination = resp.data.pagination; - }); - }; - - $scope.loadSimpleApplies(1); - }]); - - app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','client_pre_apply_id','status', function ($scope, $http, $state, $uibModal, commonDialog,client_pre_apply_id,status) { - $scope.pagination = {}; - if(status == 0 || status ==1){ - $scope.index = 1; - } - $scope.params = {client_pre_apply_id:client_pre_apply_id}; - $scope.loadDetail = function () { - $http.get('/register/manage/getOne/' + client_pre_apply_id).then(function (resp) { - $scope.partner = resp.data; - }); - }; - $scope.loadHandleLogs = function (page) { - var params = angular.copy($scope.params); - params.page = page || $scope.pagination.page || 1; - $http.get('/register/manage/log',{params:params}).then(function (resp) { - $scope.handleLogs = resp.data.data; - $scope.pagination = resp.data.pagination - }); - }; - $scope.loadDetail(1); - $scope.loadHandleLogs(); - - $scope.addHandleLog = function () { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/add_handle_log.html', - controller: 'addHandleDetailCtrl', - resolve:{ - client_pre_apply_id:function () { - return $scope.partner.client_pre_apply_id; - }} - }).result.then(function () { - $scope.loadHandleLogs(1); - commonDialog.alert({title: 'Success', type: 'success'}); - }) - }; - - $scope.closeHandleLog = function () { - commonDialog.confirm({title: 'Confirm', content: '确定此次处理已结束？' - }).then(function () { - $http.put('/register/manage/'+ client_pre_apply_id).then(function (resp) { - commonDialog.alert({title: 'Success', type: 'Success'}); - $scope.loadHandleLogs(1); - },function (resp) { - commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); - }) - }) - } - }]); - - app.controller('addHandleDetailCtrl', [ '$scope', '$http', '$state', 'client_pre_apply_id', 'commonDialog',function ($scope, $http, $state, client_pre_apply_id, commonDialog) { - $scope.handleDetail = {client_pre_apply_id:client_pre_apply_id}; - $scope.addHandleLog = function () { - $http.put('/register/manage', $scope.handleDetail).then(function (resp) { - $scope.$close(); - },function (resp) { - - }); - } - }]); - - app.controller('citypartnerRegisterListCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { - $scope.pagination = {}; - $scope.listRegisters = function (page) { - // page = page || $scope.pagination.page || 1; - $http.get('/sys/citypartners').then(function (resp) { - $scope.cityPartners = resp.data; - // $scope.cityPartners = resp.data.data; - // $scope.pagination = resp.data.pagination; - }) - }; - $scope.listRegisters(1); - - $scope.handleRegister = function (registry) { - commonDialog.confirm({ - title: 'Confirm', - content: '操作无法撤销，确认继续？' - }).then(function () { - $http.put('/sys/citypartners/' + registry.partner_id + '/handle').then(function () { - commonDialog.alert({title: 'Success', content: '处理成功', type: 'success'}); - $scope.listRegisters(); - }, function (resp) { - commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) - }) - }) - }; - }]); - app.filter('cut', function () { return function (value, wordwise, max, tail) { if (!value) return ''; diff --git a/src/main/ui/static/payment/partner/simple-apply.js b/src/main/ui/static/payment/partner/simple-apply.js new file mode 100644 index 000000000..53bcb622e --- /dev/null +++ b/src/main/ui/static/payment/partner/simple-apply.js @@ -0,0 +1,134 @@ +define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiSelect'], function (angular) { + 'use strict'; + var app = angular.module('simpleApplyApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ui.select']); + app.config(['$stateProvider', function ($stateProvider) { + $stateProvider.state('partner_apply.simple_application', { + url: '/simple/applications', + templateUrl: '/static/payment/partner/templates/simple_applications.html', + controller: 'simpleApplicationListCtrl', + data: {label: '商户自主申请列表'} + }).state('partner_apply.apply_detail', { + url: '/{client_pre_apply_id}/detail', + templateUrl: '/static/payment/partner/templates/simple_application_detail.html', + controller: 'simpleApplicationDetailCtrl', + resolve: { + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + index: ['$stateParams', function ($stateParams) { + return 0; + }] + } + }).state('partner_apply.handle_detail', { + url: '/{client_pre_apply_id}/handle', + templateUrl: '/static/payment/partner/templates/simple_application_detail.html', + controller: 'simpleApplicationDetailCtrl', + resolve: { + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + index: ['$stateParams', function ($stateParams) { + return 1; + }] + } + }) + }]); + app.controller('simpleApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', + function ($scope, $state, $http, $uibModal, commonDialog) { + $scope.pagination = {}; + $scope.params = {}; + $scope.removeStatus = function () { + if($scope.params.status){ + delete $scope.params.status; + } + }; + $scope.loadSimpleApplies = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/register/manage', {params: params}).then(function (resp) { + $scope.applies = resp.data.data; + $scope.pagination = resp.data.pagination; + }); + }; + + $scope.loadSimpleApplies(1); + }]); + + app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','client_pre_apply_id','index', function ($scope, $http, $state, $uibModal, commonDialog,client_pre_apply_id,index) { + $scope.pagination = {}; + $scope.index = index; + $scope.params = {client_pre_apply_id:client_pre_apply_id}; + $scope.loadDetail = function () { + $http.get('/register/manage/getOne/' + client_pre_apply_id).then(function (resp) { + $scope.partner = resp.data; + }); + }; + $scope.loadHandleLogs = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/register/manage/log',{params:params}).then(function (resp) { + $scope.handleLogs = resp.data.data; + $scope.pagination = resp.data.pagination + }); + }; + $scope.loadDetail(1); + $scope.loadHandleLogs(); + + $scope.addHandleLog = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/add_handle_log.html', + controller: 'addHandleDetailCtrl', + resolve:{ + client_pre_apply_id:function () { + return $scope.partner.client_pre_apply_id; + }} + }).result.then(function () { + $scope.loadHandleLogs(1); + commonDialog.alert({title: 'Success', type: 'success'}); + }) + }; + + $scope.closeHandleLog = function () { + commonDialog.confirm({title: 'Confirm', content: '确定此次处理已结束？' + }).then(function () { + $http.put('/register/manage/'+ client_pre_apply_id).then(function (resp) { + commonDialog.alert({title: 'Success', type: 'Success'}); + $scope.loadHandleLogs(1); + },function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + }) + } + }]); + + app.controller('addHandleDetailCtrl', [ '$scope', '$http', '$state', 'client_pre_apply_id', 'commonDialog',function ($scope, $http, $state, client_pre_apply_id, commonDialog) { + $scope.handleDetail = {client_pre_apply_id:client_pre_apply_id}; + $scope.addHandleLog = function () { + $http.put('/register/manage', $scope.handleDetail).then(function (resp) { + $scope.$close(); + },function (resp) { + + }); + } + }]); + + app.filter('cut', function () { + return function (value, wordwise, max, tail) { + if (!value) return ''; + + max = parseInt(max, 10); + if (!max) return value; + if (value.length <= max) return value; + + value = value.substr(0, max); + if (wordwise) { + var lastspace = value.lastIndexOf(' '); + if (lastspace != -1) { + value = value.substr(0, lastspace); + } + } + return value + (tail || ' …'); + }; + }); + return app; +}); \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html index d2ac8e958..f2f532ace 100644 --- a/src/main/ui/static/payment/partner/templates/partners_apply.html +++ b/src/main/ui/static/payment/partner/templates/partners_apply.html @@ -13,13 +13,13 @@
diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index a88245bc3..429243734 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -45,7 +45,7 @@
- + @@ -70,7 +70,7 @@ 未处理处理中 - / + — From d5c04c61b38da9986ad09990757eba3abde2b02d Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 28 Jun 2018 09:39:25 +0800 Subject: [PATCH 12/13] add apply handle --- .../static/payment/partner/templates/simple_applications.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 429243734..825f1cdf7 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -82,7 +82,7 @@ ui-sref="partner_apply.apply_detail({client_pre_apply_id:apply.client_pre_apply_id})"> Detail
- Handle From b5695df77ba840a0f72b2d88cdfc96f3d0ba7352 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 28 Jun 2018 10:07:36 +0800 Subject: [PATCH 13/13] fix html --- .../static/payment/partner/templates/simple_applications.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 825f1cdf7..0f33a608d 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -15,7 +15,7 @@    - + |  
Source Bank Client Moniker Transaction Date Gross Amount
+ + + {{settleItem.settle_date_from|limitTo:10}} ~ diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css index 327a7e4e8..b88c7fdef 100644 --- a/src/main/ui/static/css/common.css +++ b/src/main/ui/static/css/common.css @@ -549,21 +549,21 @@ position: relative; } -.active-rate-view:after{ - content:''; - clear:both; - display:block; +.active-rate-view:after { + content: ''; + clear: both; + display: block; } .active-rate-view .client-names { - width:100px; + width: 100px; overflow-x: hidden; float: left; border-right: 2px solid #bbb; display: block; } -.active-rate-view .client-name{ +.active-rate-view .client-name { width: 100%; text-align: left; font-weight: bold; @@ -571,245 +571,244 @@ border-bottom: 1px solid #bbb; } -.active-rate-view .client-row{ +.active-rate-view .client-row { height: 30px; line-height: 30px; white-space: nowrap; } -.active-rate-view .analysis-box{ +.active-rate-view .analysis-box { overflow-x: auto; display: block; float: left; padding-bottom: 5px; } -.active-rate-view .analysis-item{ +.active-rate-view .analysis-item { width: 35px; height: 100%; display: inline-block; - text-align:center; - line-height:30px; + text-align: center; + line-height: 30px; overflow: hidden; - border-right:1px solid #bbb; - border-bottom:1px solid #bbb; + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; } -.selectRow,.table-striped>tbody>tr.selectRow:nth-of-type(odd){ +.selectRow, .table-striped > tbody > tr.selectRow:nth-of-type(odd) { background-color: #E0EEE0; } - -.fountainGBox{ - position:relative; - width:108px; - height:13px; +.fountainGBox { + position: relative; + width: 108px; + height: 13px; margin: auto auto 20px; } -.fountainG{ - position:absolute; - top:0; - background-color:rgb(0,0,0); - width:13px; - height:13px; - animation-name:bounce_fountainG; - -o-animation-name:bounce_fountainG; - -ms-animation-name:bounce_fountainG; - -webkit-animation-name:bounce_fountainG; - -moz-animation-name:bounce_fountainG; - animation-duration:1.5s; - -o-animation-duration:1.5s; - -ms-animation-duration:1.5s; - -webkit-animation-duration:1.5s; - -moz-animation-duration:1.5s; - animation-iteration-count:infinite; - -o-animation-iteration-count:infinite; - -ms-animation-iteration-count:infinite; - -webkit-animation-iteration-count:infinite; - -moz-animation-iteration-count:infinite; - animation-direction:normal; - -o-animation-direction:normal; - -ms-animation-direction:normal; - -webkit-animation-direction:normal; - -moz-animation-direction:normal; - transform:scale(.3); - -o-transform:scale(.3); - -ms-transform:scale(.3); - -webkit-transform:scale(.3); - -moz-transform:scale(.3); - border-radius:9px; - -o-border-radius:9px; - -ms-border-radius:9px; - -webkit-border-radius:9px; - -moz-border-radius:9px; -} - -.fountainG.fountainG_1{ - left:0; - animation-delay:0.6s; - -o-animation-delay:0.6s; - -ms-animation-delay:0.6s; - -webkit-animation-delay:0.6s; - -moz-animation-delay:0.6s; -} - -.fountainG.fountainG_2{ - left:13px; - animation-delay:0.75s; - -o-animation-delay:0.75s; - -ms-animation-delay:0.75s; - -webkit-animation-delay:0.75s; - -moz-animation-delay:0.75s; -} - -.fountainG.fountainG_3{ - left:27px; - animation-delay:0.9s; - -o-animation-delay:0.9s; - -ms-animation-delay:0.9s; - -webkit-animation-delay:0.9s; - -moz-animation-delay:0.9s; -} - -.fountainG.fountainG_4{ - left:40px; - animation-delay:1.05s; - -o-animation-delay:1.05s; - -ms-animation-delay:1.05s; - -webkit-animation-delay:1.05s; - -moz-animation-delay:1.05s; -} - -.fountainG.fountainG_5{ - left:54px; - animation-delay:1.2s; - -o-animation-delay:1.2s; - -ms-animation-delay:1.2s; - -webkit-animation-delay:1.2s; - -moz-animation-delay:1.2s; -} - -.fountainG.fountainG_6{ - left:67px; - animation-delay:1.35s; - -o-animation-delay:1.35s; - -ms-animation-delay:1.35s; - -webkit-animation-delay:1.35s; - -moz-animation-delay:1.35s; -} - -.fountainG.fountainG_7{ - left:81px; - animation-delay:1.5s; - -o-animation-delay:1.5s; - -ms-animation-delay:1.5s; - -webkit-animation-delay:1.5s; - -moz-animation-delay:1.5s; -} - -.fountainG.fountainG_8{ - left:94px; - animation-delay:1.64s; - -o-animation-delay:1.64s; - -ms-animation-delay:1.64s; - -webkit-animation-delay:1.64s; - -moz-animation-delay:1.64s; -} - - - -@keyframes bounce_fountainG{ - 0%{ - transform:scale(1); - background-color:rgb(0,0,0); +.fountainG { + position: absolute; + top: 0; + background-color: rgb(0, 0, 0); + width: 13px; + height: 13px; + animation-name: bounce_fountainG; + -o-animation-name: bounce_fountainG; + -ms-animation-name: bounce_fountainG; + -webkit-animation-name: bounce_fountainG; + -moz-animation-name: bounce_fountainG; + animation-duration: 1.5s; + -o-animation-duration: 1.5s; + -ms-animation-duration: 1.5s; + -webkit-animation-duration: 1.5s; + -moz-animation-duration: 1.5s; + animation-iteration-count: infinite; + -o-animation-iteration-count: infinite; + -ms-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + -moz-animation-iteration-count: infinite; + animation-direction: normal; + -o-animation-direction: normal; + -ms-animation-direction: normal; + -webkit-animation-direction: normal; + -moz-animation-direction: normal; + transform: scale(.3); + -o-transform: scale(.3); + -ms-transform: scale(.3); + -webkit-transform: scale(.3); + -moz-transform: scale(.3); + border-radius: 9px; + -o-border-radius: 9px; + -ms-border-radius: 9px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; +} + +.fountainG.fountainG_1 { + left: 0; + animation-delay: 0.6s; + -o-animation-delay: 0.6s; + -ms-animation-delay: 0.6s; + -webkit-animation-delay: 0.6s; + -moz-animation-delay: 0.6s; +} + +.fountainG.fountainG_2 { + left: 13px; + animation-delay: 0.75s; + -o-animation-delay: 0.75s; + -ms-animation-delay: 0.75s; + -webkit-animation-delay: 0.75s; + -moz-animation-delay: 0.75s; +} + +.fountainG.fountainG_3 { + left: 27px; + animation-delay: 0.9s; + -o-animation-delay: 0.9s; + -ms-animation-delay: 0.9s; + -webkit-animation-delay: 0.9s; + -moz-animation-delay: 0.9s; +} + +.fountainG.fountainG_4 { + left: 40px; + animation-delay: 1.05s; + -o-animation-delay: 1.05s; + -ms-animation-delay: 1.05s; + -webkit-animation-delay: 1.05s; + -moz-animation-delay: 1.05s; +} + +.fountainG.fountainG_5 { + left: 54px; + animation-delay: 1.2s; + -o-animation-delay: 1.2s; + -ms-animation-delay: 1.2s; + -webkit-animation-delay: 1.2s; + -moz-animation-delay: 1.2s; +} + +.fountainG.fountainG_6 { + left: 67px; + animation-delay: 1.35s; + -o-animation-delay: 1.35s; + -ms-animation-delay: 1.35s; + -webkit-animation-delay: 1.35s; + -moz-animation-delay: 1.35s; +} + +.fountainG.fountainG_7 { + left: 81px; + animation-delay: 1.5s; + -o-animation-delay: 1.5s; + -ms-animation-delay: 1.5s; + -webkit-animation-delay: 1.5s; + -moz-animation-delay: 1.5s; +} + +.fountainG.fountainG_8 { + left: 94px; + animation-delay: 1.64s; + -o-animation-delay: 1.64s; + -ms-animation-delay: 1.64s; + -webkit-animation-delay: 1.64s; + -moz-animation-delay: 1.64s; +} + +@keyframes bounce_fountainG { + 0% { + transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-o-keyframes bounce_fountainG{ - 0%{ - -o-transform:scale(1); - background-color:rgb(0,0,0); +@-o-keyframes bounce_fountainG { + 0% { + -o-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -o-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -o-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-ms-keyframes bounce_fountainG{ - 0%{ - -ms-transform:scale(1); - background-color:rgb(0,0,0); +@-ms-keyframes bounce_fountainG { + 0% { + -ms-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -ms-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -ms-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-webkit-keyframes bounce_fountainG{ - 0%{ - -webkit-transform:scale(1); - background-color:rgb(0,0,0); +@-webkit-keyframes bounce_fountainG { + 0% { + -webkit-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -webkit-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -webkit-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-moz-keyframes bounce_fountainG{ - 0%{ - -moz-transform:scale(1); - background-color:rgb(0,0,0); +@-moz-keyframes bounce_fountainG { + 0% { + -moz-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -moz-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -moz-transform: scale(.3); + background-color: rgb(255, 255, 255); } } - -.analysis-nav ul li{ +.analysis-nav ul li { margin-right: 10px; margin-bottom: 10px; background-color: white; } -.analysis-nav .nav-pills li a:hover,.analysis-nav .nav-pills li a:focus,.analysis-nav .nav-pills li.active a{ + +.analysis-nav .nav-pills li a:hover, .analysis-nav .nav-pills li a:focus, .analysis-nav .nav-pills li.active a { background-color: #f06101; - border-top-color:#f06101; + border-top-color: #f06101; } -.channel-icon{ +.channel-icon { width: 16px; height: 16px; } -.channel-icon-lg{ + +.channel-icon-lg { width: 48px; height: 48px; } -.settle-forecast .rc-box .week .day{ - height:120px; + +.settle-forecast .rc-box .week .day { + height: 120px; } -.dashboard-page .tooltip .tooltip-inner{ +.dashboard-page .tooltip .tooltip-inner { max-width: 600px; text-align: center; } -.partner-settlement_page .tooltip .tooltip-inner{ - max-width: 600px; - } +.partner-settlement_page .tooltip .tooltip-inner { + max-width: 600px; +} .partner_list_style { position: relative; @@ -824,8 +823,17 @@ color: #ffffff; } -.check-i{ +.check-i { color: #00a65a; float: right; margin-top: 8px; +} + +.settle-result-box .box-header { + cursor: pointer; +} + +.settle-result-box .settle-result-table .bank-logo { + width: 24px; + vertical-align: middle; } \ No newline at end of file diff --git a/src/main/ui/static/images/bank/ANZ.png b/src/main/ui/static/images/bank/ANZ.png new file mode 100644 index 0000000000000000000000000000000000000000..661d0e6d0903dc1567e089bb902f076c4f21f7a1 GIT binary patch literal 7342 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 Uc(`}8;s5{u07*qoM6N<$g7$vcEdT%j literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/bank/CBA.png b/src/main/ui/static/images/bank/CBA.png new file mode 100644 index 0000000000000000000000000000000000000000..733de6180dd4ebb5adb8465765adeaa001177cd2 GIT binary patch literal 1662 zcmV-^27&pBP)>=E_jetq&Z9kWK&q1zSl(K~#90&72E+(>4@_6JH83NlA&yXx6%2!iJWuEZlZu zP+%Jy|NjpW+e%{Dy6YUt-w){XKIheuj%7Ea5m@Ha8QdR(OL3h}Phvy#Q!LVPdNDY# z*)koE$LTbW4Z^3Wu_~}ZRjiWOBwY*$Y&P9vRTUddSLRQSSUa%mNo=4d`7|51lRhe9 zBUPDS^H}3?wj6-U$&)Ttr80WOibWr509~0+Qvp`B#-c9%$x@6}Z5I($7LR0DQB_V9 zSP@m`Qi*$&QNUCZBdW}`SW#5!Bt}xHUh?gV1>G)8Bt}q~FGYt>bd~x}=0SxaDpIy6SA>Lh_ zI!oMxouXh}_+jn9E)c+Gp4Dn92Hus0;|9?M1Fo1)Cvsr0D*ZZ<1B2{J7>Ro@u!=!R zWMEJ#XMokJ!C+JtU~B6L25=<7N@QUED&6KSEtv1)+X=ufF9!3fnE#n51@lpfBawl* zkJeZc8JMd|j85dh+}^%H3^p1tm%9u3l`bHd{pGOT9fUKO?Zb%qMUp3&oyrgr8JLaA zQ{+zMz!t{a1@;Ef0lP4)nES)NTeAPZ8Jff@Wc~R+1F*0XcUgT-l7F>em`AlJyJ{tg z9xS}Xr%9p*iy~1E=6W0G8nXV79P;?Sv|52Th=W81CaKsYp2Q~K3BiJQ;_5@viAd#X z@D1W=7fYn_1ntR3l9d3fuW}N4$(KEeP0sEOP9g(qRSfU(RT8npuFBvNS1;vQNpkgo zRV(gx+Ryp@7!os;#3t1~Ci@}@D;kNcVwa=gbRq{fnhU;n!%Mb$XM&YnR_9_kFw#A$ z#c4LzJXpoZ+NfGLY|js+GBaCSmBc39FHn(E{$MVVf%U#YMF_dIkr+&6wlP{Nm~Wx~Ib0RSc&qH<~%(Mp>;I45MP?wYpqtiD)Xb zQawALX(VE)r0Nq}FA+&)sa#zq5}8Wa?SgLKD6n*$$W;tARu3hy ziHpiibUz3uk%8G)jL@G@B{s1idjuC=Zi9_Fwr3@|?Tydk7wf(e{SttxT+g~#S14GP zU74*ubtQVAiL%(7mAwluzrjWWX0EdATzFj}Vp*u9+fWjln5v}w_>3u$ff=bJ{FTHR zI+mHr&Jlzyv5A37{uR|jiyIp+Fx||bt^Nrtv58J4xqT5@A_G%bto=sM{5B9BtbJme zUFiaXDO9#j?2r-}n6zTq`cN+X?X(|hR~|3CWM5d~My9gdUwGjj)e10S#SR0`#EGwFN2ht6wWD_{UfKaBGZ? z>$MepmlvhI#_IRQ(0357nIBY=?epE470qy!&fl)vA(@-~RbWYzR^2zXMAA3LsE_4A?NRAOHXW07*qo IM6N<$f(<(q+5i9m literal 0 HcmV?d00001 From c30b9f0d728e59559088e5012f0bfb1d779e5695 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 12:01:47 +0800 Subject: [PATCH 02/13] ui update --- src/main/ui/static/analysis/templates/settlement_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 5157836b1..51d386d05 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -180,7 +180,7 @@
- + From f226209c9a080b3633db18c3d49a7ab1efac28b7 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 27 Jun 2018 12:20:45 +0800 Subject: [PATCH 03/13] settle mail fix --- .../manage/management/clearing/core/impl/CleanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 196ccd952..6431ae5e8 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 @@ -404,7 +404,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) { continue; } - if (bank != null && Objects.equals(settle.getString("settle_bank"), bank)) { + if (bank != null && !Objects.equals(settle.getString("settle_bank"), bank)) { continue; } Row row = sheet.createRow(rowNum++); From d48d4393d1197d5763bc557eb208ca785d22d315 Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 15:30:18 +0800 Subject: [PATCH 04/13] short url --- .../payment/manage/merchants/core/ClientManager.java | 1 + .../manage/merchants/core/impls/ClientManagerImpl.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 28b1d03c2..efbba73e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -319,4 +319,5 @@ public interface ClientManager { void removeSub(String client_moniker, JSONObject manager); + String getShortLink(String client_moniker); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index a47653f6c..59268e5e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3663,4 +3663,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } mailService.removeUnsub(sub.getLong("id")); } + + @Override + public String getShortLink(String client_moniker){ + String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/"+client_moniker+"/jump"); + MpWechatApi api = mpWechatApiProvider.getNewPaymentApi(); + return api.registerShortUrl(longUrl); + } } From 6ca6628c12e78d46b0b71ed78d2c17f7d3e4b83f Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Wed, 27 Jun 2018 15:35:23 +0800 Subject: [PATCH 05/13] fix apply --- src/db/modify.sql | 16 +- .../application/beans/AddHandleLogDetail.java | 34 ++ .../beans/ClientApplyQueryBean.java | 12 + .../application/beans/HandleLogQuery.java | 42 ++ .../core/SimpleClientApplyManageService.java | 8 + .../SimpleClientApplyManageServiceImpl.java | 60 +++ .../web/SimpleClientManageController.java | 17 + .../preapply/PreApplyHandleLogMapper.java | 23 ++ src/main/ui/manage.html | 6 +- .../static/payment/partner/partner-apply.js | 130 ++++++- .../partner/templates/add_handle_log.html | 25 ++ .../templates/partner_application.html | 106 +++++ .../templates/partner_application_detail.html | 7 - .../templates/partners_applications.html | 133 ------- .../partner/templates/partners_apply.html | 41 ++ .../templates/simple_application_detail.html | 367 +++++++++++++++--- .../templates/simple_applications.html | 31 +- 17 files changed, 845 insertions(+), 213 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java create mode 100644 src/main/ui/static/payment/partner/templates/add_handle_log.html create mode 100644 src/main/ui/static/payment/partner/templates/partner_application.html delete mode 100644 src/main/ui/static/payment/partner/templates/partners_applications.html create mode 100644 src/main/ui/static/payment/partner/templates/partners_apply.html diff --git a/src/db/modify.sql b/src/db/modify.sql index b2e1be0e5..c4461a130 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -580,4 +580,18 @@ update log_clearing_detail set settle_bank='CBA'; ALTER TABLE `log_clearing` -ADD COLUMN `editable` tinyint(1) NULL DEFAULT 1 COMMENT '是否可编辑' AFTER `balance`; \ No newline at end of file +ADD COLUMN `editable` tinyint(1) NULL DEFAULT 1 COMMENT '是否可编辑' AFTER `balance`; + + +CREATE TABLE `pre_apply_handle_log` ( + `id` varchar(50) NOT NULL, + `client_pre_apply_id` int(11) NOT NULL, + `client_id` int(11) NOT NULL, + `auditor` varchar(30) NOT NULL, + `auditor_id` varchar(50) NOT NULL, + `remark` varchar(100) DEFAULT NULL, + `create_time` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `client_id` (`client_id`) USING BTREE, + KEY `client_pre_apply_id` (`client_pre_apply_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java new file mode 100644 index 000000000..3c86497c9 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java @@ -0,0 +1,34 @@ +package au.com.royalpay.payment.manage.application.beans; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + +/** + * Created by yuan on 2018/6/27. + */ +public class AddHandleLogDetail { + private String client_pre_apply_id; + + private String remark; + + public JSONObject insertObject() { + JSONObject res = (JSONObject) JSON.toJSON(this); + return res; + } + + public String getClient_pre_apply_id() { + return client_pre_apply_id; + } + + public void setClient_pre_apply_id(String client_pre_apply_id) { + this.client_pre_apply_id = client_pre_apply_id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java index fe125e02b..520c9dfe3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java @@ -11,12 +11,16 @@ public class ClientApplyQueryBean { private int page = 1; private int limit = 10; private String agree; + private String status; public JSONObject insertObject() { JSONObject params = new JSONObject(); if(StringUtils.isNotEmpty(agree)){ params.put("agree",agree); } + if(StringUtils.isNotEmpty(status)){ + params.put("status",status); + } return params; } @@ -43,4 +47,12 @@ public class ClientApplyQueryBean { public void setAgree(String agree) { this.agree = agree; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java new file mode 100644 index 000000000..b3b049f63 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java @@ -0,0 +1,42 @@ +package au.com.royalpay.payment.manage.application.beans; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + +/** + * Created by yuan on 2018/6/27. + */ +public class HandleLogQuery { + private int page = 1; + private int limit = 10; + private String client_pre_apply_id; + + public JSONObject insertObject() { + JSONObject res = (JSONObject) JSON.toJSON(this); + return res; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public String getClient_pre_apply_id() { + return client_pre_apply_id; + } + + public void setClient_pre_apply_id(String client_pre_apply_id) { + this.client_pre_apply_id = client_pre_apply_id; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java index e86ebe66b..62ad51225 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.application.core; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import com.alibaba.fastjson.JSONObject; /** @@ -10,4 +12,10 @@ public interface SimpleClientApplyManageService { JSONObject listsApplies(JSONObject manager,ClientApplyQueryBean clientApplyQueryBean); JSONObject findOneApply(JSONObject manager,String client_pre_apply_id); + + JSONObject listAllHandleLogs(JSONObject manager,HandleLogQuery handleLogQuery); + + void addHandleLog(JSONObject manager,AddHandleLogDetail addHandleLogDetail); + + void closeHandle(JSONObject manager,String client_pre_apply_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java index bba7f38df..7b8dc3d10 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java @@ -1,9 +1,13 @@ package au.com.royalpay.payment.manage.application.core.impls; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService; +import au.com.royalpay.payment.manage.mappers.preapply.PreApplyHandleLogMapper; import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper; import au.com.royalpay.payment.tools.exceptions.BadRequestException; +import au.com.royalpay.payment.tools.exceptions.NotFoundException; import au.com.royalpay.payment.tools.utils.PageListUtils; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; @@ -12,6 +16,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; /** * Created by yuan on 2018/6/4. @@ -20,12 +25,16 @@ import javax.annotation.Resource; public class SimpleClientApplyManageServiceImpl implements SimpleClientApplyManageService{ @Resource private SysClientPreMapperMapper sysClientPreMapperMapper; + + @Resource + private PreApplyHandleLogMapper preApplyHandleLogMapper; @Override public JSONObject listsApplies(JSONObject manager, ClientApplyQueryBean clientApplyQueryBean) { if(manager == null){ throw new BadRequestException(); } JSONObject params = clientApplyQueryBean.insertObject(); + PageList applies = sysClientPreMapperMapper.listApplies(params, new PageBounds(clientApplyQueryBean.getPage(), clientApplyQueryBean.getLimit(), Order.formString("create_time.desc"))); return PageListUtils.buildPageListResult(applies); @@ -38,4 +47,55 @@ public class SimpleClientApplyManageServiceImpl implements SimpleClientApplyMan } return sysClientPreMapperMapper.findOneByClientPreApplyId(client_pre_apply_id); } + + @Override + public JSONObject listAllHandleLogs(JSONObject manager, HandleLogQuery handleLogQuery) { + if(manager == null){ + throw new BadRequestException(); + } + JSONObject params = handleLogQuery.insertObject(); + PageList allLogs = preApplyHandleLogMapper.listHandleLogs(params,new PageBounds(handleLogQuery.getPage(),handleLogQuery.getLimit(),Order.formString("create_time.desc"))); + return PageListUtils.buildPageListResult(allLogs); + } + + @Override + public void addHandleLog(JSONObject manager, AddHandleLogDetail addHandleLogDetail) { + if(manager == null){ + throw new BadRequestException(); + } + JSONObject apply = sysClientPreMapperMapper.findOneByClientPreApplyId(addHandleLogDetail.getClient_pre_apply_id()); + if (apply == null) { + throw new NotFoundException("Apply Record Not Found Please Check"); + } + JSONObject detail = addHandleLogDetail.insertObject(); + detail.put("auditor", manager.getString("display_name")); + detail.put("client_id", apply.getIntValue("client_id")); + detail.put("auditor_id", manager.getString("manager_id")); + detail.put("create_time", new Date()); + preApplyHandleLogMapper.save(detail); + apply.put("status",1); + sysClientPreMapperMapper.update(apply); + + } + + @Override + public void closeHandle(JSONObject manager, String client_pre_apply_id) { + JSONObject apply = sysClientPreMapperMapper.findOneByClientPreApplyId(client_pre_apply_id); + if (apply == null) { + throw new NotFoundException("Apply Record Not Found Please Check"); + } + if (apply.getIntValue("status") == 2) { + throw new BadRequestException("The Record Has Been Handled"); + } + JSONObject detail = new JSONObject(); + detail.put("client_pre_apply_id", client_pre_apply_id); + detail.put("client_id", apply.getIntValue("client_id")); + detail.put("auditor", manager.getString("display_name")); + detail.put("auditor_id", manager.getString("manager_id")); + detail.put("remark", "结停"); + detail.put("create_time", new Date()); + preApplyHandleLogMapper.save(detail); + apply.put("status", 2); + sysClientPreMapperMapper.update(apply); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java index ad049b8f2..b1d698e57 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.application.web; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService; import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; @@ -29,4 +31,19 @@ public class SimpleClientManageController { public JSONObject findOneApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){ return simpleClientApplyManageService.findOneApply(manager,client_pre_apply_id); } + + @ManagerMapping(value = "/log",method = RequestMethod.GET,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public JSONObject listAllHandleLog(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HandleLogQuery handleLogQuery){ + return simpleClientApplyManageService.listAllHandleLogs(manager,handleLogQuery); + } + + @ManagerMapping(method = RequestMethod.PUT,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public void addHandleLog(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody AddHandleLogDetail addHandleLogDetail){ + simpleClientApplyManageService.addHandleLog(manager,addHandleLogDetail); + } + + @ManagerMapping(value = "/{client_pre_apply_id}",method = RequestMethod.PUT,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public void closeHandle(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){ + simpleClientApplyManageService.closeHandle(manager,client_pre_apply_id); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java new file mode 100644 index 000000000..5902e73e2 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java @@ -0,0 +1,23 @@ +package au.com.royalpay.payment.manage.mappers.preapply; + +import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; +import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; +import cn.yixblog.support.mybatis.autosql.annotations.SqlType; +import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@AutoMapper(tablename = "pre_apply_handle_log", pkName = "id") +public interface PreApplyHandleLogMapper { + @AutoSql(type = SqlType.UPDATE) + void update(JSONObject data); + + @AutoSql(type = SqlType.INSERT) + void save(JSONObject data); + + @AutoSql(type = SqlType.SELECT) + PageList listHandleLogs(JSONObject params, PageBounds pagination); +} diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index ee79f7308..ba2e6f05b 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -237,7 +237,7 @@ margin-bottom: 10%;"/>
  • - + 自主申请|Partner Applies
    • @@ -268,11 +268,11 @@ margin-bottom: 10%;"/> -
  • +
  • diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js index 95eccd922..3531d7fb7 100644 --- a/src/main/ui/static/payment/partner/partner-apply.js +++ b/src/main/ui/static/payment/partner/partner-apply.js @@ -2,12 +2,15 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS 'use strict'; var app = angular.module('partnerApplyApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ui.select']); app.config(['$stateProvider', function ($stateProvider) { - $stateProvider.state('partner_application', { - url: '/partner/applications', - templateUrl: '/static/payment/partner/templates/partners_applications.html', - controller: 'partnerApplicationListCtrl', - data: {label: '商户申请列表'} - }).state('detail', { + $stateProvider.state('partner_apply', { + url: '/partner/apply', + templateUrl: '/static/payment/partner/templates/partners_apply.html', + controller: 'partnerApplyCtrl' + }).state('partner_apply.partner_application', { + url: '/application', + templateUrl: '/static/payment/partner/templates/partner_application.html', + controller: 'partnerApplicationListCtrl' + }).state('partner_apply.detail', { url: '/{client_apply_id}/detail', templateUrl: '/static/payment/partner/templates/partner_application_detail.html', controller: 'partnerApplicationDetailCtrl', @@ -16,22 +19,34 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS return $http.get('/partners/application/' + $stateParams.client_apply_id); }] } - }).state('partner_application.simple_application', { + }).state('partner_apply.simple_application', { url: '/simple/applications', templateUrl: '/static/payment/partner/templates/simple_applications.html', controller: 'simpleApplicationListCtrl', data: {label: '商户自主申请列表'} - }).state('apply_detail', { - url: '/{client_pre_apply_id}/simple/detail', + }).state('partner_apply.apply_detail', { + url: '/{client_pre_apply_id}/{status}/detail', templateUrl: '/static/payment/partner/templates/simple_application_detail.html', controller: 'simpleApplicationDetailCtrl', resolve: { - apply: ['$http', '$stateParams', function ($http, $stateParams) { - return $http.get('/register/manage/getOne/' + $stateParams.client_pre_apply_id); + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + status: ['$stateParams', function ($stateParams) { + return $stateParams.status; }] } + }).state('partner_apply.citypartner_reg', { + url: '/citypartner_registries', + templateUrl: '/static/citypartner/templates/citypartner_registers.html', + controller: 'citypartnerRegisterListCtrl' }) }]); + app.controller('partnerApplyCtrl', ['$rootScope','$state', function ($rootScope,$state) { + if ($state.is('partner_apply')){ + $state.go('.partner_application'); + } + }]); app.controller('partnerApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', function ($scope, $state, $http, $uibModal, commonDialog, industryMap, stateMap,countryMap) { $scope.pagination = {}; @@ -217,7 +232,11 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS function ($scope, $state, $http, $uibModal, commonDialog) { $scope.pagination = {}; $scope.params = {}; - + $scope.removeStatus = function () { + if($scope.params.status){ + delete $scope.params.status; + } + }; $scope.loadSimpleApplies = function (page) { var params = angular.copy($scope.params); params.page = page || $scope.pagination.page || 1; @@ -230,8 +249,91 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.loadSimpleApplies(1); }]); - app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','apply', function ($scope, $http, $state, $uibModal, commonDialog,apply) { - $scope.partner = apply.data; + app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','client_pre_apply_id','status', function ($scope, $http, $state, $uibModal, commonDialog,client_pre_apply_id,status) { + $scope.pagination = {}; + if(status == 0 || status ==1){ + $scope.index = 1; + } + $scope.params = {client_pre_apply_id:client_pre_apply_id}; + $scope.loadDetail = function () { + $http.get('/register/manage/getOne/' + client_pre_apply_id).then(function (resp) { + $scope.partner = resp.data; + }); + }; + $scope.loadHandleLogs = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/register/manage/log',{params:params}).then(function (resp) { + $scope.handleLogs = resp.data.data; + $scope.pagination = resp.data.pagination + }); + }; + $scope.loadDetail(1); + $scope.loadHandleLogs(); + + $scope.addHandleLog = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/add_handle_log.html', + controller: 'addHandleDetailCtrl', + resolve:{ + client_pre_apply_id:function () { + return $scope.partner.client_pre_apply_id; + }} + }).result.then(function () { + $scope.loadHandleLogs(1); + commonDialog.alert({title: 'Success', type: 'success'}); + }) + }; + + $scope.closeHandleLog = function () { + commonDialog.confirm({title: 'Confirm', content: '确定此次处理已结束？' + }).then(function () { + $http.put('/register/manage/'+ client_pre_apply_id).then(function (resp) { + commonDialog.alert({title: 'Success', type: 'Success'}); + $scope.loadHandleLogs(1); + },function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + }) + } + }]); + + app.controller('addHandleDetailCtrl', [ '$scope', '$http', '$state', 'client_pre_apply_id', 'commonDialog',function ($scope, $http, $state, client_pre_apply_id, commonDialog) { + $scope.handleDetail = {client_pre_apply_id:client_pre_apply_id}; + $scope.addHandleLog = function () { + $http.put('/register/manage', $scope.handleDetail).then(function (resp) { + $scope.$close(); + },function (resp) { + + }); + } + }]); + + app.controller('citypartnerRegisterListCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { + $scope.pagination = {}; + $scope.listRegisters = function (page) { + // page = page || $scope.pagination.page || 1; + $http.get('/sys/citypartners').then(function (resp) { + $scope.cityPartners = resp.data; + // $scope.cityPartners = resp.data.data; + // $scope.pagination = resp.data.pagination; + }) + }; + $scope.listRegisters(1); + + $scope.handleRegister = function (registry) { + commonDialog.confirm({ + title: 'Confirm', + content: '操作无法撤销，确认继续？' + }).then(function () { + $http.put('/sys/citypartners/' + registry.partner_id + '/handle').then(function () { + commonDialog.alert({title: 'Success', content: '处理成功', type: 'success'}); + $scope.listRegisters(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + }) + }) + }; }]); app.filter('cut', function () { diff --git a/src/main/ui/static/payment/partner/templates/add_handle_log.html b/src/main/ui/static/payment/partner/templates/add_handle_log.html new file mode 100644 index 000000000..b80a2b2ee --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/add_handle_log.html @@ -0,0 +1,25 @@ +
    +

    Handle Detail

    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/main/ui/static/payment/partner/templates/partner_application.html b/src/main/ui/static/payment/partner/templates/partner_application.html new file mode 100644 index 000000000..5541bd35e --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_application.html @@ -0,0 +1,106 @@ +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    +
    +

    Application List

    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Application TimeCompany NameSuburbSourceApprove StatusPartner CodeProgressOperation
    + PC + 公众号菜单 + 公众号推送 + 小程序申请 + App申请 + + Waiting Approving + BD Approaching ({{partner.bd_user_name}}) + Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}}) + Not Pass + + {{partner.client_moniker}} + + + Link + + + Detail + +
    + +
    +
    + +
    +
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    +
    +
    +
    + + +
    + +
    +
    +
    + \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partner_application_detail.html b/src/main/ui/static/payment/partner/templates/partner_application_detail.html index 7f8fc903e..2dbbe5252 100644 --- a/src/main/ui/static/payment/partner/templates/partner_application_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_application_detail.html @@ -2,13 +2,6 @@

    -
      -
    1. - Notice -
      2. -
    2. Partner Application
      3. -
    3. Partner Detail
      4. -
    diff --git a/src/main/ui/static/payment/partner/templates/partners_applications.html b/src/main/ui/static/payment/partner/templates/partners_applications.html deleted file mode 100644 index 4f9f53f4a..000000000 --- a/src/main/ui/static/payment/partner/templates/partners_applications.html +++ /dev/null @@ -1,133 +0,0 @@ - -
    -

    Partner Application

    -
      -
    1. - Payment -
      2. -
    2. Partner Applications
      3. -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    - -
    -
    -
    -

    Application List

    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Application TimeCompany NameSuburbSourceApprove StatusPartner CodeProgressOperation
    - PC - 公众号菜单 - 公众号推送 - 小程序申请 - App申请 - - Waiting Approving - BD Approaching ({{partner.bd_user_name}}) - Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}}) - Not Pass - - {{partner.client_moniker}} - - - Link - - - Detail - -
    - -
    -
    - -
    -
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html new file mode 100644 index 000000000..d2ac8e958 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partners_apply.html @@ -0,0 +1,41 @@ + +
    +

    Partner Application

    +
      +
    1. + Payment +
      2. +
    2. Partner Applications
      3. +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + diff --git a/src/main/ui/static/payment/partner/templates/simple_application_detail.html b/src/main/ui/static/payment/partner/templates/simple_application_detail.html index 10cff1183..fd8995609 100644 --- a/src/main/ui/static/payment/partner/templates/simple_application_detail.html +++ b/src/main/ui/static/payment/partner/templates/simple_application_detail.html @@ -3,17 +3,286 @@ 暂无 -
      -
    1. - Notice -
      2. -
    2. Application & Open
      3. -
    3. Apply Detail
      4. -
    -
    +
    +
    + + +
    +
    +
    + Partner Basic Information + (Refused) + (Pass) + + ({{partner.bd_user_name}} is following) +
    +
    + + {{$select.selected.display_name}} + +
    +     +     +
    + + +
    +     + + + + + + + + + + +
    + + Refuse + +
    +
    +
    + + {{$select.selected.display_name}} + +
    +     +     +
    + + +
    +
    + + PASS + +
    +     +
    +
    +
    +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    + + + + + + + + + + + + + + +
    + + +
    + +
    +
    +
    + + +
    +

    +
    +
    + + + + + + + + + + + + + + +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    +
    +
    + +
    +
    Contact Information
    +
    +
    +
    + + +
    +

    +
    +
    + + + + + + + +
    + + +
    +

    +
    +
    +
    + + +
    +

    +
    +
    +
    +
    +
    + +
    +
    Approaching Progress
    +
    +
    +
    +
    + + Save +
    +
    +

    +
    +
    + +
    +
    +
    +
    +     + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + +
    Handle TimeOperatorDetail
    {{log.create_time}}{{log.auditor}}{{log.remark}}
    +
    + +
    +
    +
    + +
    + + +
    +
    + + <!–
    –> - - - - - - - + <!––> + <!––> + <!–
    –>
    Refuse @@ -105,20 +374,20 @@

    - - + <!–
    –> + <!––> - - - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –> + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -134,20 +403,20 @@

    - - + <!–
    –> + <!––> - - - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –> + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -186,7 +455,7 @@
    - + <!–end 商户基本资料–>
    Contact Information
    @@ -198,13 +467,13 @@

    - - + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -222,7 +491,7 @@
    - + <!–end 商户联系资料–>
    Approaching Progress
    @@ -245,5 +514,5 @@
    - + --> \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 6d5530245..a88245bc3 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -7,14 +7,25 @@
    + 已申请 +    + + + + +
    @@ -34,6 +45,7 @@
    		• Company Name StatusHandle Detail Create Time Apply Source Operation 已申请 ({{apply.client_moniker}}) - 申请中 + 申请失败 (step2) (step3) (step4) + + 未处理 + 处理中 + + / + pc @@ -60,7 +79,7 @@ + ui-sref="partner_apply.apply_detail({client_pre_apply_id:apply.client_pre_apply_id,status:apply.status})"> Detail Company Name StatusHandle DetailHandle Status Create Time Apply Source Operation @@ -79,8 +79,12 @@ + ui-sref="partner_apply.apply_detail({client_pre_apply_id:apply.client_pre_apply_id})"> Detail +
    + + Handle