Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -1200,7 +1200,9 @@ public class RetailAppServiceImp implements RetailAppService {
     public JSONObject bankAccountInfo(JSONObject device) {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
-        return clientManager.getBankAccountByClientId(device.getIntValue("client_id"));
+        JSONObject bankInfo = clientManager.getBankAccountByClientId(device.getIntValue("client_id"));
+        bankInfo.put("account_no","***"+ StringUtils.substring(bankInfo.getString("account_no"), -4));
+        return bankInfo;
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java

@@ -25,6 +25,7 @@ import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
 
 import com.alibaba.fastjson.JSONObject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
@@ -267,7 +268,9 @@ public class PartnerViewController {
     @PartnerMapping(value = "/bank_account", method = RequestMethod.GET)
     @ResponseBody
     public JSONObject getClientBankAccount(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
-        return clientManager.listClientBankAccounts(null, account.getString("client_moniker"));
+        JSONObject bankInfo = clientManager.listClientBankAccounts(null, account.getString("client_moniker"));
+        bankInfo.put("account_no","***"+ StringUtils.substring(bankInfo.getString("account_no"), -4));
+        return bankInfo;
     }
 
     @PartnerMapping(value = "/rates", method = RequestMethod.GET)