diff --git a/pom.xml b/pom.xml
index b185b8e7f..924ec5959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.0.29
+ 1.0.30
UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java
index e854e4423..7581c3d9d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java
@@ -13,6 +13,8 @@ public interface AliforexcelService {
JSONObject registerAlipayOnlineMerchant();
+ JSONObject registerRangeAlipayOnlineMerchant(int start,int end);
+
JSONObject registerAlipayMerchant();
JSONObject registerInsertAlipayMerchant(String partners);
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
index 04e8acdfe..9b1cc391b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
@@ -109,7 +109,68 @@ public class AliforexcelServiceImpl implements AliforexcelService {
List registerSuccessMerchant = new ArrayList<>();
List registerFailMerchant = new ArrayList<>();
List lessInfoMerchant = new ArrayList<>();
- List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant();
+ List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(0,10000);
+ for (int clientId : useAlipayOnlineMerchant) {
+ JSONObject client = clientMapper.findClient(clientId);
+ if (client == null) {
+ continue;
+ }
+ try {
+ needRegisterMerchant.add(client.getString("client_moniker"));
+ if (StringUtils.isBlank(client.getString("company_website"))) {
+ client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au");
+ }
+ checkPartnerInfo(client,"online");
+ } catch (InvalidParameterException e) {
+ JSONObject exception = new JSONObject();
+ exception.put("client_moniker", client.getString("client_moniker"));
+ exception.put("return_msg", e.getMessage());
+ exception.put("bd_name", client.getString("bd_user_name"));
+ lessInfoMerchant.add(exception);
+ continue;
+ }
+ try {
+ AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
+ Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
+ if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
+ JSONObject exception = new JSONObject();
+ exception.put("client_moniker", client.getString("client_moniker"));
+ exception.put("return_msg", resultElement.elementText("error"));
+ registerFailMerchant.add(exception);
+ continue;
+ }
+ Element responseElement = resultElement.element("response").element("alipay");
+ if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) {
+ JSONObject exception = new JSONObject();
+ exception.put("client_moniker", client.getString("client_moniker"));
+ exception.put("return_msg", resultElement.elementText("error"));
+ registerFailMerchant.add(exception);
+ continue;
+ }
+ registerSuccessMerchant.add(client.getString("client_moniker"));
+ } catch (Exception e) {
+ JSONObject exception = new JSONObject();
+ exception.put("client_moniker", client.getString("client_moniker"));
+ exception.put("return_msg", e.getMessage());
+ registerFailMerchant.add(exception);
+ }
+ }
+ result.put("need_register_merchant", needRegisterMerchant);
+ result.put("success_register_merchant", registerSuccessMerchant);
+ result.put("fail_register_merchant", registerFailMerchant);
+ result.put("less_info_merchant", lessInfoMerchant);
+ logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString());
+ return result;
+ }
+
+ @Override
+ public JSONObject registerRangeAlipayOnlineMerchant(int start, int end) {
+ JSONObject result = new JSONObject();
+ List needRegisterMerchant = new ArrayList<>();
+ List registerSuccessMerchant = new ArrayList<>();
+ List registerFailMerchant = new ArrayList<>();
+ List lessInfoMerchant = new ArrayList<>();
+ List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(start,end);
for (int clientId : useAlipayOnlineMerchant) {
JSONObject client = clientMapper.findClient(clientId);
if (client == null) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index 8e5906843..772075c1c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -459,6 +459,11 @@ public class TestController implements ApplicationEventPublisherAware {
return aliforexcelService.registerAlipayOnlineMerchant();
}
+ @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET)
+ public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) {
+ return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end);
+ }
+
@ManagerMapping(value = "/register/alipayGms", role = ManagerRole.DEVELOPER, method = RequestMethod.POST)
public JSONObject registerAlipayMerchant() {
return aliforexcelService.registerAlipayMerchant();
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index 41497c5f6..6caa61cea 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -131,6 +131,6 @@ public interface ClientMapper {
JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month);
- List listUseAlipayMerchant();
+ List listUseAlipayMerchant(@Param("start") int start, @Param("end") int end);
}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index fc464e886..34e56dbd9 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -704,5 +704,6 @@