自助进件费率配置分开

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -77,22 +77,16 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
     private ClientManager clientManager;
     @Resource
     private SignInAccountService signInAccountService;
-
     @Resource
     private ClientAccountMapper clientAccountMapper;
-
     @Resource
     private SysClientPreMapperMapper sysClientPreMapperMapper;
-
     @Resource
     private ClientBankAccountMapper clientBankAccountMapper;
-
     @Resource
     private ClientMapper clientMapper;
-
     @Resource
     private ClientRateMapper clientRateMapper;
-
     @Resource
     private ClientConfigMapper clientConfigMapper;
     @Resource
@@ -352,7 +346,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysRate.put("active_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
         sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd"));
 
-        JSONObject rateConfig = clientManager.getSysRateConfig();
+        JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_rates"));
         JSONObject chooseRate = new JSONObject();
         if (apply.getIntValue("clean_days") == 1) {
             chooseRate = rateConfig.getJSONObject("t1");

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,12 @@ 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_rates"));
+    }
+
 }
+

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -269,8 +269,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Resource
     private SimpleClientApplyService simpleClientApplyService;
     @Resource
-    private MongoTemplate mongoTemplate;
-    @Resource
     private MailGunService mailGunService;
     @Resource
     private MailSendMapper mailSendMapper;

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) {
         })