diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java index 9d4988793..dc132e346 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java @@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.application.web; import au.com.royalpay.payment.manage.application.beans.ClientPreApplyBean; import au.com.royalpay.payment.manage.application.beans.ClientPreApplyStep1Bean; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; +import au.com.royalpay.payment.tools.env.SysConfigManager; import com.alibaba.fastjson.JSONObject; @@ -23,6 +24,8 @@ import javax.validation.Valid; public class SimpleClientApplyController { @Resource private SimpleClientApplyService simpleClientApplyService; + @Resource + private SysConfigManager sysConfigManager; @RequestMapping(value = "/account/check", method = RequestMethod.GET) public void checkAccountName(@RequestParam String nation_code,@RequestParam String phone) { @@ -75,4 +78,10 @@ public class SimpleClientApplyController { simpleClientApplyService.checkOrGenerateRegisterProcessKey(username, codeKey); return simpleClientApplyService.getBankInfo(bsb_no); } + + @RequestMapping(value = "/config/sys_rates", method = RequestMethod.GET) + public JSONObject getSysRate() { + JSONObject sysConfig = sysConfigManager.getSysConfig(); + return JSONObject.parseObject(sysConfig.getString("sys_apply_rates")); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java index eb655766a..e95733bb2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java @@ -23,4 +23,4 @@ public interface MailSendMapper { @AutoSql(type = SqlType.SELECT) JSONObject find(@Param("id") String id, @Param("mail_address")String mail_address); -} +} \ No newline at end of file diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js index 8ea3dc57a..e27211577 100644 --- a/src/main/ui/static/merchantapplication/merchant_application.js +++ b/src/main/ui/static/merchantapplication/merchant_application.js @@ -114,7 +114,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', $scope.chooseArray[index] = true; }; $scope.getRateConfig = function () { - $http.get('/sys/partners/sys_rates').then(function (resp) { + $http.get('/register/config/sys_rates').then(function (resp) { $scope.sysRateConfig = resp.data; }, function (resp) { })