add rpay merchant

pom.xml

@@ -36,6 +36,10 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>jd-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.com.royalpay.payment</groupId>
+            <artifactId>rpay-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.stuxuhai</groupId>
             <artifactId>jpinyin</artifactId>

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

@@ -336,5 +336,7 @@ public interface ClientManager {
 
     void sendHfEmailNotice(JSONObject order);
 
+    String subRpayMerchantApplication(String clientMoniker, JSONObject manager);
+
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 }

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

@@ -7,9 +7,7 @@ import au.com.royalpay.payment.channels.wechat.config.WechatPayEnvironment;
 import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
 import au.com.royalpay.payment.channels.wechat.runtime.WxPayClient;
 import au.com.royalpay.payment.channels.wechat.runtime.beans.SubMerchantInfo;
-
 import au.com.royalpay.payment.core.PaymentChannelApi;
-import au.com.royalpay.payment.core.beans.PayChannel;
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
@@ -44,6 +42,7 @@ import au.com.royalpay.payment.manage.mappers.system.MailUnsubMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.manage.mappers.system.PermissionPartnerModuleMapper;
+import au.com.royalpay.payment.manage.mappers.system.SysRpayMerchantApplyMapper;
 import au.com.royalpay.payment.manage.mappers.system.SysWxMerchantApplyMapper;
 import au.com.royalpay.payment.manage.merchants.beans.ActivityPosterBuilder;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
@@ -176,7 +175,6 @@ import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 
 import cn.yixblog.platform.http.HttpRequestGenerator;
 import cn.yixblog.platform.http.HttpRequestResult;
@@ -284,6 +282,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Resource
     private ClientInfoCacheSupport clientInfoCacheSupport;
 
+    @Resource
+    private RpayApi rpayApi;
     @Resource
     private SimpleClientApplyService simpleClientApplyService;
     @Resource

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

@@ -1,7 +1,13 @@
 package au.com.royalpay.payment.manage.merchants.web;
 
 import au.com.royalpay.payment.manage.dev.core.MerchantLocationService;
-import au.com.royalpay.payment.manage.merchants.beans.*;
+import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRateConfig;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
+import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
+import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.merchants.beans.SubMerchantIdApply;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.permission.manager.RequireManager;
@@ -11,17 +17,26 @@ import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+
 import com.alibaba.fastjson.JSONObject;
+
 import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 /**
  * Created by yixian on 2016-06-27.
  */
@@ -566,5 +581,9 @@ public class PartnerManageController {
     public void switchHfEmailNotice(@PathVariable String clientMoniker, @RequestBody JSONObject pass, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.switchPermission(manager, clientMoniker, "enable_hf_email_notice", pass.getBooleanValue("allow"));
     }
+    @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
+    public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        return clientManager.subRpayMerchantApplication(clientMoniker, manager);
+    }
 
 }