From 5875534cb43808a4bfbf713dbee2c51bd0e2bc57 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 16:12:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../dev/core/impl/AliforexcelServiceImpl.java | 13 ++++++++++++- .../payment/manage/dev/web/TestController.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 90202a62f..1574953c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.31 + 1.0.32 UTF-8 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 9b1cc391b..d03e19576 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 @@ -120,6 +120,12 @@ public class AliforexcelServiceImpl implements AliforexcelService { if (StringUtils.isBlank(client.getString("company_website"))) { client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); } + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } checkPartnerInfo(client,"online"); } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); @@ -181,7 +187,12 @@ public class AliforexcelServiceImpl implements AliforexcelService { if (StringUtils.isBlank(client.getString("company_website"))) { client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); } - checkPartnerInfo(client,"online"); + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); exception.put("client_moniker", client.getString("client_moniker")); 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 772075c1c..0f8ff74f7 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,7 +459,7 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayOnlineMerchant(); } - @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) + @ManagerMapping(value = "/register/alipayOnlineGms/range", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) { return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end); }