diff --git a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java index 27c702b5e..c4f16424b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java +++ b/src/main/java/au/com/royalpay/payment/manage/apsKYC/web/RestApsKYCController.java @@ -33,7 +33,7 @@ public class RestApsKYCController { * @param pageSize 每页数 * @return */ - @ManagerMapping(value = "/notices", method = RequestMethod.GET, role = {ManagerRole.ADMIN}) + @ManagerMapping(value = "/notices", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.SALES_MANAGER}) public JSONObject getApsNotices(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) { PageBounds pageBounds = new PageBounds(page, pageSize); @@ -41,7 +41,13 @@ public class RestApsKYCController { return PageListUtils.buildPageListResult(apply); } - @ManagerMapping(value = "/notice", method = RequestMethod.GET, role = {ManagerRole.ADMIN}) + /** + * 获取消息通知详情 + * + * @param id 通知id + * @return AddNoticeCommand + */ + @ManagerMapping(value = "/notice", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.SALES_MANAGER}) public AddNoticeCommand getApsNotice(@RequestParam String id) { return apsNoticeService.getApsNotice(id); } @@ -54,7 +60,7 @@ public class RestApsKYCController { * @param id 消息id * @return JSONObject */ - @ManagerMapping(value = "/notice/clients", method = RequestMethod.GET, role = {ManagerRole.ADMIN}) + @ManagerMapping(value = "/notice/clients", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.SALES_MANAGER}) public JSONObject getApsNoticeClients(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize, @RequestParam String id) { @@ -69,7 +75,7 @@ public class RestApsKYCController { * @param manager 运营用户 * @param addNoticeCommand 新增数据 */ - @ManagerMapping(value = "/notice", method = RequestMethod.POST, role = {ManagerRole.ADMIN}) + @ManagerMapping(value = "/notice", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SALES_MANAGER}) public void addApsNotice(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody AddNoticeCommand addNoticeCommand) { apsNoticeService.saveApsNotice(manager, addNoticeCommand); } @@ -80,7 +86,7 @@ public class RestApsKYCController { * @param manager 运营用户 * @param item 消息数据 */ - @ManagerMapping(value = "/notice", method = RequestMethod.PUT, role = {ManagerRole.ADMIN}) + @ManagerMapping(value = "/notice", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SALES_MANAGER}) public void stopApsNotice(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody JSONObject item) { apsNoticeService.stopApsNotice(manager, item.getString("id")); } @@ -91,7 +97,7 @@ public class RestApsKYCController { * @param manager 运营数据 * @param apsNoticeClient 消息关联商户数据 */ - @ManagerMapping(value = "/notice/client", method = RequestMethod.PUT, role = {ManagerRole.ADMIN}) + @ManagerMapping(value = "/notice/client", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SALES_MANAGER}) public void updateApsNoticeClient(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody ApsNoticeClient apsNoticeClient) { apsNoticeService.updateApsNoticeClient(manager, apsNoticeClient); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java index 4d1f8f254..fe0e7fd68 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java @@ -17,7 +17,7 @@ public interface ApsNoticeClientMapper { @AutoSql(SqlType.INSERT) void saveApsNoticeClient(ApsNoticeClient apsNoticeClient); - + @AutoSql(SqlType.UPDATE) void updateApsNoticeClient(ApsNoticeClient apsNoticeClient); PageList getApsNoticeClients(String id, PageBounds pageBounds); diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index beee21dfb..cf5f47f49 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -70,20 +70,25 @@ .dh { animation: myfirst 1s linear 0s infinite alternate; } - .navbar-header a{ + + .navbar-header a { color: #FFF; } - .navbar-header .active{ + + .navbar-header .active { background-color: #FFF !important; } - .navbar-header .active a{ + + .navbar-header .active a { color: #f06101 !important; } + .navbar-header li { float: left; border: 1px solid #FFF; padding: 3px 15px; } + @media (min-width: 768px) { .navbar-header { list-style: none; @@ -150,13 +155,15 @@ margin-bottom: 10%;"/> ng-click="toggleHideSideBar()"> Toggle navigation -
@@ -216,7 +232,8 @@ margin-bottom: 10%;"/> -
  • -

    +

  • +

    交易管理|Transaction @@ -355,22 +378,26 @@ margin-bottom: 10%;"/> R-Service交易统计

    • -
  • +
  • 交易数据|Transaction Data
    • -
  • +
  • Gateway统计
    • -
  • +
  • 退款统计|Refund Analysis
    • -
  • +
  • 支付通道|Channels Analysis @@ -427,7 +454,8 @@ margin-bottom: 10%;"/>
  • - + 风控业务|Risk Business
    • @@ -459,7 +487,8 @@ margin-bottom: 10%;"/> -
  • +

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

    • -
  • -

    +

  • +

    清算管理|Settlement @@ -582,7 +615,8 @@ margin-bottom: 10%;"/> 清算月报

    • -
  • +
  • 清算验证|Validation @@ -591,7 +625,8 @@ margin-bottom: 10%;"/>
  • -

    +

    财务管理|Financial @@ -618,7 +653,8 @@ margin-bottom: 10%;"/> 腾讯打款记录|Tencent Settlement

    • -
  • +
  • BD提成|BD Commissions @@ -657,7 +693,8 @@ margin-bottom: 10%;"/>
  • -

    +

    营销活动管理|Promotion @@ -759,11 +796,17 @@ margin-bottom: 10%;"/> 积分商城|Integral Mall

    • +
  • + + A+的KYC通知 + +
  • -

    +

    组织架构|Organization @@ -798,8 +841,10 @@ margin-bottom: 10%;"/>

    • -
  • -

    +

  • +

    绩效管理|Performance @@ -811,12 +856,14 @@ margin-bottom: 10%;"/> BD销售量|BD Sale

    • -
  • +
  • BD提成|BD Commissions
    • -
  • +
  • BD团队分析|BD Team Analysis @@ -850,7 +897,8 @@ margin-bottom: 10%;"/>
  • -

    +

    合伙人管理|Partner @@ -868,7 +916,8 @@ margin-bottom: 10%;"/> 合伙人管理

    • -
  • +
  • 合伙人销售量|City Partner Sale @@ -887,7 +936,8 @@ margin-bottom: 10%;"/>
  • -

    +

    配置管理|Basic Settings @@ -915,7 +965,8 @@ margin-bottom: 10%;"/>

  • -

    +

    开发工具|Developer @@ -946,7 +997,8 @@ margin-bottom: 10%;"/>

  • -

    +

    机构管理|OrgManager diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 3d771db67..5601c1882 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -457,16 +457,6 @@

    • -
    - -
    - -
    - A+的KYC通知 -
    -
    -     -
    @@ -806,6 +796,16 @@
    +
    + +
    + +
    + A+的KYC通知 +
    +
    +     +