From 3b2718e6fe7c1e0d62f31bf8e92119c8fc41b557 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 18 Jan 2018 17:01:36 +0800 Subject: [PATCH] fix~ --- .../manage/merchants/core/ClientManager.java | 2 + .../core/impls/ClientManagerImpl.java | 5 + .../static/payment/partner/partner-manage.js | 29 ++++ .../templates/apply_sub_merchant_id.html | 131 ++++++++++++++++++ .../partner/templates/partner_detail.html | 3 + .../templates/sub_merchant_id_apply.html | 57 ++++++++ 6 files changed, 227 insertions(+) create mode 100644 src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html create mode 100644 src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html 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 7f29c5718..6b63cfb9a 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 @@ -264,4 +264,6 @@ public interface ClientManager { void validRefundPwd(JSONObject account, String pwd); void setWeekendDelay(int clientId, boolean delay); + + List listSubMerchantIdApplys(JSONObject manager, String clientMoniker); } 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 1b1b54812..2ccdff4ed 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 @@ -2922,4 +2922,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } } + + @Override + public List listSubMerchantIdApplys(JSONObject manager, String clientMoniker) { + return null; + } } diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index a4fab9761..030e2a776 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -109,6 +109,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter url: '/partner_product', templateUrl: 'static/payment/product/templates/product.html', controller: 'productCtrl' + }).state('partners.detail.sub_merchant_applicaitons', { + url: '/sub_merchant_applicaitons', + templateUrl: 'static/payment/partner/templates/sub_merchant_id_apply.html', + controller: 'subMerchantIdApplicaitonsCtrl' }); }]); app.controller('partnerListCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', @@ -2522,6 +2526,31 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }]); + app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal','$state', 'industryMap', function ($scope, $http, $uibModal, $state, industryMap) { + $scope.industries = industryMap.configs(); + $scope.loadSubMerchantInfos = function () { + /* $http.get('/client/product/' + $scope.partner.client_moniker + '/list', {params: params}).then(function (resp) { + $scope.subMerchantInfos = resp.data.data; + + });*/ + }; + $scope.applySubMerchantId = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/apply_sub_merchant_id.html', + controller: 'applySubMerchantIdCtrl', + resolve: { + subMerchantInfo:function () { + return $scope.partner; + } + } + }).result.then(function () { + $scope.loadSubMerchantInfos(); + }) + }; + }]); + app.controller('applySubMerchantIdCtrl', ['$scope', '$http', '$uibModal','$state','subMerchantInfo', 'industryMap', function ($scope, $http, $uibModal, $state, subMerchantInfo,industryMap) { + $scope.subMerchantInfo = angular.copy(subMerchantInfo); + }]); app.filter('bdOrg', function () { return function (bdUsers, org_id) { if (org_id) { diff --git a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html new file mode 100644 index 000000000..85fecea34 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html @@ -0,0 +1,131 @@ +
+
+
+
+
+
Apply Sub Merchant Id
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 50

+
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 50

+
+
+
+ +
+ +
+ +
+

Required Field

+
+
+
+

More than 50

+
+
+ +
+ +
+ +
+

Required Field

+

Length is more than 20

+
+
+
+ +
+ +
+ +
+

Required Field

+

Length is more than 256

+

Length is less than 10

+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ + + + + + + + +
+ +
+
+
+
+
\ No newline at end of file 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 0e9956049..c17ba2bb9 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -238,6 +238,9 @@
  • Product
    • +
  • + Sub Merchant Id Applicaitons +
    • diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html new file mode 100644 index 000000000..4f50cfb50 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -0,0 +1,57 @@ +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +

    List of Sub Merchant Id

    +
    +
    +
      +
    • + Sub Merchant Id + +
      • +
    • + Apply Time + +
      • +
    • + Merchant Short Name + +
      • +
    • + Business Category + +
      • +
    • + Description + +
      • + + +
    • + Operator + +
      • + +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file