From 5b7f5e43c5cff8c7d313159ac9d43ac89f564991 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 17 Jul 2019 17:47:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../application/beans/ClientPreApplyBean.java | 6 +- .../core/impls/PermissionManagerImpl.java | 2 +- .../core/impls/OrgManagerImpl.java | 2 +- .../manage/signin/beans/QueryManagerBean.java | 6 +- .../core/impls/ManagerAccountServiceImpl.java | 2 +- src/main/ui/manage.html | 22 +++---- src/main/ui/managev2.html | 4 +- src/main/ui/static/boot/managerMainApp.js | 6 ++ src/main/ui/static/boot/managerMainAppv2.js | 6 ++ .../config/managers/templates/managers.html | 4 +- .../config/managers/templates/modify.html | 10 +-- .../managers/templates/new_manager.html | 4 +- .../templates/org_detail_parent.html | 16 ++--- .../sysconfigs/templates/func_info_edit.html | 6 +- .../templates/permission_config.html | 8 +-- .../templates/permission_functions.html | 4 +- src/main/ui/static/menu/managerMenu.js | 3 + src/main/ui/static/menu/templates/home.html | 9 +++ .../ui/static/menu/templates/main_menu.html | 61 +++++++++++++------ 20 files changed, 114 insertions(+), 69 deletions(-) diff --git a/pom.xml b/pom.xml index ba021b96f..f7b6879e5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.1.2 - 1.1.17 + 1.1.18 diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java index 0d40d8a79..8c95254c0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java @@ -53,15 +53,15 @@ public class ClientPreApplyBean { private String codeKey; private boolean agree; private String nation_code; - private String client_pay_type; - private String client_pay_desc; + private String client_pay_type = "2"; + private String client_pay_desc = "201"; public JSONObject insertObject() { JSONObject res = (JSONObject) JSON.toJSON(this); List keys = new ArrayList<>(); res.keySet().forEach(p-> { - if (StringUtils.isEmpty(res.getString(p).trim())) { + if (StringUtils.isBlank(res.getString(p))) { keys.add(p); } }); diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java index 821f9f5e9..c8b743046 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java @@ -81,7 +81,7 @@ public class PermissionManagerImpl implements PermissionManager { func.put("bdleader", ManagerRole.BD_LEADER.hasRole(role)); func.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role)); func.put("guest", ManagerRole.GUEST.hasRole(role)); -// manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); + func.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); func.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role)); // manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role)); diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java index 7d5e4aed0..8e38c3705 100644 --- a/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java @@ -178,7 +178,7 @@ public class OrgManagerImpl implements OrgManager { if (manager.getInteger("org_id")!=null){ List orgs = orgMapper.listOrgAndChild(manager.getIntValue("org_id")); List orgIds = orgs.stream().map(org->org.getIntValue("org_id")).collect(Collectors.toList()); - if (!orgIds.contains(params.getString("org_id"))){ + if (!orgIds.contains(params.getIntValue("org_id"))){ throw new ForbiddenException("You have no permission to query the org"); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java b/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java index c9132aca2..50d3a0a45 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java @@ -62,9 +62,9 @@ public class QueryManagerBean { if(role.equals("100000000000")){ mask = ManagerRole.GUEST.getMask(); } -// if(role.equals("1000000000000")){ -// mask = ManagerRole.ORG_MANAGER.getMask(); -// } + if(role.equals("1000000000000")){ + mask = ManagerRole.ORG_MANAGER.getMask(); + } if(role.equals("10000000000000")){ mask = ManagerRole.SALES_MANAGER.getMask(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java index 410aeb123..e59925e25 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java @@ -63,7 +63,7 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService { manager.put("bdleader", ManagerRole.BD_LEADER.hasRole(role)); manager.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role)); manager.put("guest", ManagerRole.GUEST.hasRole(role)); -// manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); + manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); manager.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role)); // manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role)); diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index dd9d38331..615b152f1 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -244,8 +244,8 @@ margin-bottom: 10%;"/> ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"> - - + @@ -306,17 +306,17 @@ margin-bottom: 10%;"/> 商户进件|New Partner -
  • +
  • 商户统计|Merchants Data
    • -
  • +
  • 商户活跃度
    • -
  • +
  • 商户交易额统计 @@ -343,22 +343,22 @@ margin-bottom: 10%;"/> 交易流水|Trades Logs
    • -
  • +
  • 交易数据|Transaction Data
    • -
  • +
  • Gateway统计
    • -
  • +
  • 退款统计|Refund Analysis
    • -
  • +
  • 支付通道|Channels Analysis @@ -442,7 +442,7 @@ margin-bottom: 10%;"/>
    • -
  • +

  • 风控管理|Risk @@ -763,7 +763,7 @@ margin-bottom: 10%;"/>

    • -
  • +

  • 绩效管理|Performance diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html index c7cb46ee3..5cc15ab68 100644 --- a/src/main/ui/managev2.html +++ b/src/main/ui/managev2.html @@ -284,8 +284,8 @@ margin-bottom: 10%;"/> ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"> - - + diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index 05cb42ee9..d1d9fa639 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -241,6 +241,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "guest": rolenum = 2048; break; + case "orgmanager": + rolenum = 4096; + break; case "riskmanager": rolenum = 1024; break; @@ -286,6 +289,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo if ((role & 2048) >0){ roleMenu.push({'value':'guest','module':"访客中心"}); } + if ((role & 4096) >0){ + roleMenu.push({'value':'orgmanager','module':"代理商中心"}); + } if ((role & 8192) >0){ roleMenu.push({'value':'salesmanager','module':"销管中心"}); } diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js index 2d0e72d86..446eb4582 100644 --- a/src/main/ui/static/boot/managerMainAppv2.js +++ b/src/main/ui/static/boot/managerMainAppv2.js @@ -36,6 +36,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo if ((role & 2048) >0){ roleMenu.push({'value':'guest','module':"访客中心"}); } + if ((role & 4096) >0){ + roleMenu.push({'value':'orgmanager','module':"代理商中心"}); + } if ((role & 8192) >0){ roleMenu.push({'value':'salesmanager','module':"销管中心"}); } @@ -137,6 +140,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "guest": roleNow = "访客中心"; break; + case "orgmanager": + roleNow = "代理商中心"; + break; default: break; } diff --git a/src/main/ui/static/config/managers/templates/managers.html b/src/main/ui/static/config/managers/templates/managers.html index 0006548c4..b715f382d 100644 --- a/src/main/ui/static/config/managers/templates/managers.html +++ b/src/main/ui/static/config/managers/templates/managers.html @@ -36,7 +36,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/src/main/ui/static/config/managers/templates/modify.html b/src/main/ui/static/config/managers/templates/modify.html index 26741b752..e7c427388 100644 --- a/src/main/ui/static/config/managers/templates/modify.html +++ b/src/main/ui/static/config/managers/templates/modify.html @@ -103,9 +103,9 @@ - + + + @@ -120,9 +120,9 @@ - +

    +

    diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html index 3464f49de..67d929ab0 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html +++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html @@ -217,7 +217,7 @@
    @@ -281,10 +281,10 @@ % -
    - +
    +
    - + %
    @@ -341,11 +341,11 @@
    - + ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}"> +
    - + %
    diff --git a/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html b/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html index b3b76de42..65b0fdb6a 100644 --- a/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html +++ b/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html @@ -49,9 +49,9 @@ - + diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html index 45bd1090c..27fcf694c 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html @@ -79,10 +79,10 @@ GUEST - - - - + + + Org Manager + Sales Manager diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html index 99637583e..98d783515 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html @@ -36,7 +36,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js index 06ce0a528..d4dd27937 100644 --- a/src/main/ui/static/menu/managerMenu.js +++ b/src/main/ui/static/menu/managerMenu.js @@ -44,6 +44,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { case "guest": rolenum = 2048; break; + case "orgmanager": + rolenum = 4096; + break; case "riskmanager": rolenum = 1024; break; diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html index 283fe4e14..a99ec42d6 100644 --- a/src/main/ui/static/menu/templates/home.html +++ b/src/main/ui/static/menu/templates/home.html @@ -153,6 +153,15 @@ +
    + +
    + +
    +

    代理商中心

    +     +
    + diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index abf5be44b..1236bafd1 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -71,7 +71,7 @@ -
    +
    @@ -81,7 +81,7 @@
    -
    +
    @@ -91,7 +91,7 @@
    -
    +
    @@ -113,7 +113,7 @@
    -->
    -
    +
    -
    +
    @@ -142,7 +142,7 @@
    -
    +
    @@ -152,7 +152,7 @@
    -
    +
    @@ -162,7 +162,7 @@
    -
    +
    @@ -195,7 +195,7 @@
    -
    +
    -
    +
    @@ -481,7 +481,7 @@
    -
    +
    @@ -489,7 +489,7 @@
    -
    +
    @@ -539,7 +539,7 @@
    -
    +
    @@ -560,7 +560,7 @@
    -
    +
    @@ -1071,7 +1071,7 @@
    -
    +
    @@ -1080,17 +1080,38 @@
    -
    - +
    +
    - +
    - 机构数据分析 + 组织管理
    -
    + +
    + + + + + + + + + + + + + + + + + + + +