From 8c32b331adc38f255772a732f3b86c0d856aa864 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:16:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add=20alipay=20online=20=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/impl/AliforexcelServiceImpl.java | 10 +++++++++- .../payment/manage/mappers/system/ClientMapper.java | 3 +++ .../payment/manage/mappers/system/ClientMapper.xml | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 55932b945..5f190c5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.26 + 1.0.27 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 46a94aec3..9e8a5a143 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 @@ -21,6 +21,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.dom4j.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -44,6 +46,8 @@ public class AliforexcelServiceImpl implements AliforexcelService { private AlipayClient alipayClient; @Resource private OrderMapper orderMapper; + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override public JSONObject listClients(HttpServletResponse httpResponse,JSONObject manager, AliExcel query) { @@ -105,7 +109,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { List registerSuccessMerchant = new ArrayList<>(); List registerFailMerchant = new ArrayList<>(); List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = transactionMapper.useAlipayOnlineClients(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(); for (int clientId : useAlipayOnlineMerchant) { JSONObject client = clientMapper.findClient(clientId); if (client == null) { @@ -113,6 +117,9 @@ public class AliforexcelServiceImpl implements AliforexcelService { } 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(); @@ -145,6 +152,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { 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; } 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 a142120c2..062933a06 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 @@ -136,4 +136,7 @@ public interface ClientMapper { int getPartnercode(@Param("codes") String codes); JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month); + + List listUseAlipayMerchant(); + } 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 663dfd9f2..e38fbae78 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 @@ -735,6 +735,9 @@ WHERE address= #{address} GROUP BY address + + From 52fda84527896259bbb6532a9a24ae93b0168471 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:48:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E5=85=A8=E9=87=8F=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../dev/core/impl/AliforexcelServiceImpl.java | 35 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5f190c5ca..afcf33741 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.27 + 1.0.28 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 9e8a5a143..04e8acdfe 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 @@ -129,24 +129,31 @@ public class AliforexcelServiceImpl implements AliforexcelService { lessInfoMerchant.add(exception); continue; } - 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"))) { + 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", resultElement.elementText("error")); + exception.put("return_msg", e.getMessage()); registerFailMerchant.add(exception); - continue; } - registerSuccessMerchant.add(client.getString("client_moniker")); } result.put("need_register_merchant", needRegisterMerchant); result.put("success_register_merchant", registerSuccessMerchant); From 326e16838c80ba7bdcb872585d70803e65c21f44 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 25 Jul 2019 17:14:44 +0800 Subject: [PATCH 3/3] update parent version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afcf33741..107be3249 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 1.0.1 + 1.0.4 4.0.0