From c04d6d93c4d95dd7dc44e7c17d20da1cc97bdde9 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Thu, 5 Apr 2018 18:07:38 +0800 Subject: [PATCH] fix --- .../payment/manage/merchants/web/PartnerViewController.java | 4 ++-- src/main/ui/static/boot/indexMainApp.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java index 022986b47..7f66f4f8d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java @@ -369,13 +369,13 @@ public class PartnerViewController { clientManager.changeManualSettle(account.getIntValue("client_id"),manual_settle,account.getString("account_id"),1,"商户"+(manual_settle?"打开":"关闭")+"手动清算"); } - @PartnerMapping(value = "/checkContract", method = RequestMethod.GET) + @PartnerMapping(value = "/checkContract", method = RequestMethod.GET,roles = {PartnerRole.ADMIN, PartnerRole.MANAGER}) @ResponseBody public JSONObject getCheckClientInfov2(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { return clientManager.getCheckClientInfo(account.getIntValue("client_id"),account.getString("account_id"),"PC"); } - @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST,roles = PartnerRole.ADMIN) + @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST,roles = {PartnerRole.ADMIN, PartnerRole.MANAGER}) @ResponseBody public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id"),"PC"); diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index 1a75cbcdb..ca8629687 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -131,7 +131,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }); }; - // $scope.getAgStatus(); + $scope.getAgStatus(); $scope.refundNotice = {counts: 0}; $scope.openRefundNotice = false; $scope.showRefundNotice = function () {