From 1a6f0cd5caab46f389dd4e09bbfda6c9a1b0b62a Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Wed, 27 Apr 2022 15:06:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5aps=E8=B4=B9=E7=8E=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B=E5=8D=A1=E6=94=AF=E4=BB=98=E5=90=88?= =?UTF-8?q?=E5=90=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/impls/ClientManagerImpl.java | 18 ++++++++++++++++-- src/main/ui/static/data/alipayMcc.json | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8ac66875d..003db81e9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.4.14 + 2.4.15 UTF-8 2.4.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 6d0eb8c3d..26ab2ff09 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -4695,6 +4695,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (rate == null) { throw new BadRequestException("The Partner's Rate is not config!"); } + checkChannelRate(client,PayChannel.ALIPAY_APS_IN_STORE.getChannelCode()); + checkChannelRate(client,PayChannel.ALIPAY_APS_CASHIER.getChannelCode()); + List clientFiles = clientFilesMapper.findClientFile(client.getIntValue("client_id")); if (clientFiles == null || clientFiles.equals("")) { throw new BadRequestException("The Compliance File Must Be Uploaded!"); @@ -4719,6 +4722,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid sendCommissionWechatMessage(client); } } + private void checkChannelRate(JSONObject client,String channel){ + MerchantChannelPermissionResolver resolver = this.paymentApi.channelApi(channel).getChannelPermissionResolver(); + if (!Objects.isNull(resolver) && + resolver.newOrderEnabled(client, null, PlatformEnvironment.getEnv().getForeignCurrency()) + ) { + JSONObject rateApsInstore = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), channel); + if (rateApsInstore == null) { + throw new BadRequestException("The Partner's "+channel+" Rate is not config!"); + } + } + } @Override @Transactional @@ -7342,14 +7356,14 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid //装在数据 JSONObject info = new JSONObject(); info.put("down_date", formatter.print(new DateTime()));//下载文件日期 - info.put("bussiness_name", (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " " + client.getString("abn"));//商圈类型 + info.put("bussiness_name", (client.containsKey("company_name") ? client.getString("company_name") : legalInfo.getString("representative_person")) + " " + client.getString("abn"));//商圈类型 info.put("partner_address", client.getString("address"));//商家店铺地址 info.put("partner_country", client.getString("country"));//国家 info.put("partner_state", client.getString("state"));//洲 info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称 info.put("clean_days", clientRate.getInteger("clean_days"));//T+规则清算天数 info.put("partner_industry_mcc", upayProfileInfo.getString("mw_industry"));//信用卡注册商户行业编码 - info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码 + info.put("legal_bussiness", legalInfo.getString("company_name") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码 info.put("annual_rate", cardAnnualRate);//年费率 info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本 String domesticRateValue = cardRate.getString("domestic_rate_value"); diff --git a/src/main/ui/static/data/alipayMcc.json b/src/main/ui/static/data/alipayMcc.json index 0d98e594f..09bb31e7d 100644 --- a/src/main/ui/static/data/alipayMcc.json +++ b/src/main/ui/static/data/alipayMcc.json @@ -1134,7 +1134,7 @@ { "children": [], "label": "Digital Goods: Games", - "mccCode": "5816", + "mccCode": " 5816", "value": "{\"category\":\"OTHER\",\"code\":\"5816\",\"description\":\"Digital Goods: Games\",\"parentCode\":\"D05\"}" }, { From af0807b3f675288c7e3a14b33f2ea586762342ed Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Wed, 27 Apr 2022 15:08:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../au/com/royalpay/payment/manage/dev/web/TestController.java | 1 + 1 file changed, 1 insertion(+) 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 9c91e5a9f..d8725038f 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 @@ -312,6 +312,7 @@ public class TestController { */ @ManagerMapping(value = "/{clientMoniker}/export/aggregate/card_agree_pdf", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.DIRECTOR, ManagerRole.OPERATOR}) public void exportAggregateCardAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) throws Exception { + logger.info("=====>exportAggregateCardAgreeFile"); clientManager.getAggregateCardAgreeFileAgain(clientMoniker, manager); } From 7eab8fae40556be16c8e2a6052f9a8d29133c4d8 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Wed, 27 Apr 2022 15:46:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E5=90=88?= =?UTF-8?q?=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 26ab2ff09..25fde2f81 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -7363,7 +7363,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称 info.put("clean_days", clientRate.getInteger("clean_days"));//T+规则清算天数 info.put("partner_industry_mcc", upayProfileInfo.getString("mw_industry"));//信用卡注册商户行业编码 - info.put("legal_bussiness", legalInfo.getString("company_name") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码 + info.put("legal_bussiness", client.getString("company_name") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码 info.put("annual_rate", cardAnnualRate);//年费率 info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本 String domesticRateValue = cardRate.getString("domestic_rate_value"); From b344b1fe1d3e9839efadae66c43733cddc082f8e Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Thu, 28 Apr 2022 14:12:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?invice=E5=AF=BC=E5=87=BA=20=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E7=BC=BA=E5=B0=91aps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 7bd44636f..086b071d6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -832,7 +832,8 @@ public class TradeLogServiceImpl implements TradeLogService { // } @Override public void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { - JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"}); + logger.info("=======>exportTransFlow"); + JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline","ApsCashier","ApsInstore"}); JSONObject analysis = transFlow.getJSONObject("analysis"); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); Context ctx = new Context(); @@ -1008,7 +1009,8 @@ public class TradeLogServiceImpl implements TradeLogService { @Override public ModelAndView exportTransFlow(TradeLogQuery query, JSONObject partner, Model model) throws Exception { - JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"}); + logger.info("=======>exportTransFlow::"); + JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline","ApsCashier","ApsInstore"}); JSONObject analysis = transFlow.getJSONObject("analysis"); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); ModelAndView view = new ModelAndView("app/invoice.html"); From 51d3b2f657ee78ef2c88e0018cb5db996bfc4f91 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Thu, 28 Apr 2022 14:13:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 003db81e9..4c22babe5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.4.15 + 2.4.16 UTF-8 2.4.0