From 684f0f6bf1a9b38f95eaf08f6d3280770e00fe43 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 6 May 2020 09:58:46 +0800 Subject: [PATCH 1/9] update ios notify cert --- extra/apple_message_cert_product_20200506.p12 | Bin 0 -> 3313 bytes pom.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 extra/apple_message_cert_product_20200506.p12 diff --git a/extra/apple_message_cert_product_20200506.p12 b/extra/apple_message_cert_product_20200506.p12 new file mode 100644 index 0000000000000000000000000000000000000000..4bd03a9d75df2893e63ca671bc1b0934f5cc393c GIT binary patch literal 3313 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index f23809de6..594dfc176 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.2.27 + 2.2.28 UTF-8 1.8.0 From 00194266de0e318d548dadc93b195f3fa268e855 Mon Sep 17 00:00:00 2001 From: dulingling Date: Wed, 6 May 2020 10:42:38 +0800 Subject: [PATCH 2/9] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E5=8D=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=BC=80=E5=85=B3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/payment/partner/templates/partner_payment_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 4c031e5be..ad5e3c2b7 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -466,7 +466,7 @@ -
+
Card Payment Config
From bca2ca36a1d927bc9b72dc342bf9627e6d266e10 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 6 May 2020 15:58:57 +0800 Subject: [PATCH 3/9] update 2.1.38 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 594dfc176..82258ddde 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.1.36 + 2.1.38 4.0.0 manage - 2.2.28 + 2.2.29 UTF-8 1.8.0 From 0347c890b31d7c19cd457d6acab2db47c2dae982 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 7 May 2020 13:38:19 +0800 Subject: [PATCH 4/9] update 2.1.39 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 82258ddde..43ebf26b5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.1.38 + 2.1.39 4.0.0 manage - 2.2.29 + 2.2.30 UTF-8 1.8.0 From e0e23bf920888944294e070ed43e33fe5304b16f Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 7 May 2020 15:02:18 +0800 Subject: [PATCH 5/9] fix abn --- src/main/ui/static/payment/partner/templates/add_partner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index cd24bc7f2..952266506 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -220,7 +220,7 @@
- +
Date: Fri, 8 May 2020 09:48:04 +0800 Subject: [PATCH 6/9] update 2.2.32 --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 43ebf26b5..e3edce957 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.2.30 + 2.2.32 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index e027041ff..69ef8d993 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -290,11 +290,11 @@ public class RetailAppServiceImp implements RetailAppService { res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId)); } params.put("channel", "system"); - res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params))); + res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); params.put("channel", "rpaypmt_card"); - res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params))); + res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); params.put("channel", "rpaypmt_dd"); - res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params))); + res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); return res; } @@ -870,7 +870,7 @@ public class RetailAppServiceImp implements RetailAppService { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); int clientId = device.getIntValue("client_id"); - JSONObject client = clientManager.getClientInfo(9); + JSONObject client = clientManager.getClientInfo(clientId); String timezoneClient = client.getString("timezone"); if (timezoneClient != null && !timezone.isEmpty()) { timezone = timezoneClient; From 6e8bea6e43ad7ff9f6676954b10e4622dc1eceed Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 8 May 2020 11:32:31 +0800 Subject: [PATCH 7/9] update 2.1.40 fix refund error --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e3edce957..8c3b3f4ee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.1.39 + 2.1.40 4.0.0 manage - 2.2.32 + 2.2.33 UTF-8 1.8.0 From 42c30ce9af854cab610ccd9c750e34b37cf65810 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 8 May 2020 16:19:19 +1000 Subject: [PATCH 8/9] profile update --- src/main/resources/application-rppaysvc.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/application-rppaysvc.yml b/src/main/resources/application-rppaysvc.yml index 484d8a4f6..5acb434de 100644 --- a/src/main/resources/application-rppaysvc.yml +++ b/src/main/resources/application-rppaysvc.yml @@ -4,4 +4,7 @@ app: priv-key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDE55tREo6t6m1hekGlaMmDivorV3a+MkA/Wna0k917u/CGYIf7FtmWk1um7VcBRdljluLjqThePZgbgtwqTdHWXJP2gPwoJjLUluVEyKh19blSgrq7K1FEryAzQ5XFLzMX//EMc1BNrqcREHC6XVlJeNzpOd8+C83cxGxL+ayLoQ/ePEyp/8yXBbA6t2yXyi7H1ry8WiFFg9RFf+zAeESFXlKIS72fw9I9GxG6PLUhbD8S+IIJ2A0ZudKUQIUw4M0wSilo40lfqp/xRyfUBZevKcPrO5/ZCJX6V2d154s1m5p0Z/eLtQ1ido0quVi/LzBb1KXDYNHV6hPJjNQmNbMnAgMBAAECggEAY/rqLW9LzVk0cwN947xiXg2qW2mM3KRtZP3NOoG+O37BcaoAQelnUILATfFDdVz/Ngc+a7TX71o9KvL2UfCztLHLW6ZA4y4KL1HzVkrA5yx/DjtdD36+RC7cHcuad8YwnmYSAm1nABrHr+12H9sYZCsfmLkO9tVNkWSXTLiY+UhJ1hTua2LYgaTsHR9lYLt/K+PNIBAToKuMcKFTEMWbrnekrFhXkPdeS3alFL/0X7csaPhLvZTDaAtpAytvnmN4nuZmnONnDqPJ3IEFjc7xwZ15D9Qgv/+g74q1VzU/0+2421S6BSijUK3kUdeHXASU3YvIczfnbr5t+NYL7nd68QKBgQDlLFNMz9rVFLd5b351tnld9rni8KzHi+V+eXeJpQ+zriTODOvvkFJrTSZKm+JQoBrpTI+EA1fovxLnDBhNnrR4HmHhudMTGqU6JOZLj+fk8UQKXDpVEGWO6QT68ds+Ii1ex1UEkbBkLWGrrHlFAdY0q+Af7L7Fe0osZX9382b+aQKBgQDb9EmDD79IFOxSjMJVnlN0g2P48hQ9M40cEzXRD/iyyBr9l8rE400Q6GT35ZgHKSrG2nXZehWCaQQqniHu+y6UHnJfhbC0LEYdcYRoyamlGwEFp8xSRJ88R2IoL+2g+XJ1Tc6eACjsEJWZooga6bqdrYjaAe0uSGid0Buh6JMTDwKBgGIfJFtS84MgJ55a2m5T/or4xIYiPhgCEfSg1Umd3qcz/JYseihMRr2ifq6bJ78VjfAt05TWSaFhjhpW12EEfoifmZEoGvOnCO9oNSJNLyCbHGLDMkaRiqoxouw++XwU7hASkJgwOLHrrFHwusuNCcXrgT6qAtRTAWMY4gbdtE9hAoGAWnZsTZUKbND+KS1vN9t4I3FuipK1tD4hiSx1c9iHxq/6OdZWNQfvSEbsT/CDyF4sE8EBu0I02n/qkMSc3Dc+fvjOvW60sEWNSMrJVHesaBVlJDhRFnzWqOoK+tBLgWtWodwwYFdcfUqM3LU2GSuL7xHSOSeVrvVk4ZMX6k1HQA0CgYAypY0eecX8Gc7SCt7wpYoNuL2MuZZIDXNZVMpWYMokA1Z74oX1uzecyTNLHgCFHpjiJPyc6KW1/pnDpcA9FuTmLUuNyuqsX85IEMZPkIqPFebAl4IvOuwzvXDPxxgh8B+XBQBydgFADeqgqXG8rxomC4PUrX47pKb1G89bTGp8Dw== pub-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmifNnVZG6HZBYdvLnCGyNm7rQTZKyl3w+7xdBGgjsQeaskdy/IgmrWRG4Ii1o82KV/ZA+bw86vE37axpoxbqOU3LYVb69nVYvmJOL018iBs74HhbZ8CtWtQmEIKqmX/rNUdp15OgwzDckvrK/EEzjdOoQfAkFB68wLOsTcsRwBB3JUL/uiHGK6b5Ofmh4PxYeAVNpWYHyCaQIuN6JH85VHBVS4etP25GbgWxl+ktuZucaPsQ2G25mwhlpNiC28J4la0wD33JKMfCNCjORlWkw2HcDvrRLqza4lJOXu0rFy3JuUkZ0hn834ZWd3MboqNNE6a2xe4ppZUJ9ccM9312JQIDAQAB server-root: https://channel.rpayplus.com/channel/v1/ + upload-file-keys: + - upay_application_form + - upay_desc_file From 86751b2c94527e515b3de303b6735ffe63a831ba Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 8 May 2020 14:47:44 +0800 Subject: [PATCH 9/9] update 2.2.32 --- pom.xml | 4 +-- .../core/impls/TradeLogServiceImpl.java | 26 ++++++++++-------- ...ncremental_partner_upay_invoice_gst.jasper | Bin 0 -> 85632 bytes .../tradelog/templates/balance_report.html | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/jasper/incremental_partner_upay_invoice_gst.jasper diff --git a/pom.xml b/pom.xml index 8c3b3f4ee..cff7bc145 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.1.40 + 2.1.41 4.0.0 manage - 2.2.33 + 2.2.34 UTF-8 1.8.0 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 b6046766c..8982082ab 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 @@ -138,6 +138,8 @@ public class TradeLogServiceImpl implements TradeLogService { private org.springframework.core.io.Resource incremental_trans_flow; @Value("classpath:/jasper/partner_upay_invoice_gst.jasper") private org.springframework.core.io.Resource upay_trans_flow; + @Value("classpath:/jasper/incremental_partner_upay_invoice_gst.jasper") + private org.springframework.core.io.Resource incremental_upay_trans_flow; @Value("classpath:/jasper/royalpay_logo.png") private org.springframework.core.io.Resource logo; @Value("classpath:/jasper/trans_excel.jasper") @@ -822,20 +824,23 @@ public class TradeLogServiceImpl implements TradeLogService { parmerters.put("incremental_fee", takeDecimalOrDefault(analysis, "total_incremental_surcharge", BigDecimal.ZERO)); parmerters.put("incremental_gst", takeDecimalOrDefault(analysis, "total_incremental_tax", BigDecimal.ZERO)); parmerters.put("royalpay_gst", analysis.getBigDecimal("tax_amount").subtract(analysis.getBigDecimal("total_incremental_tax")).setScale(2,RoundingMode.HALF_UP)); - parmerters.put("total_transaction_fee", analysis.getBigDecimal("total_transaction_fee").add(analysis.getBigDecimal("total_transaction_fee_tax")).setScale(2,RoundingMode.HALF_UP)); - parmerters.put("total_royalpay_fee", analysis.getBigDecimal("total_surcharge").subtract(parmerters.getBigDecimal("total_transaction_fee")).setScale(2,RoundingMode.HALF_UP)); - + BigDecimal totalTransactionFee = analysis.getBigDecimal("total_transaction_fee").add(analysis.getBigDecimal("total_transaction_fee_tax")).setScale(2, RoundingMode.HALF_UP); + BigDecimal totalRoyalpayFee = analysis.getBigDecimal("total_surcharge") + .subtract(analysis.getBigDecimal("total_transaction_fee")) + .subtract(analysis.getBigDecimal("total_transaction_fee_tax")) + .subtract(analysis.getBigDecimal("total_incremental_surcharge")) + .subtract(analysis.getBigDecimal("total_incremental_tax")).setScale(2, RoundingMode.HALF_UP); + parmerters.put("total_transaction_fee", totalTransactionFee); + parmerters.put("total_royalpay_fee", totalRoyalpayFee); + parmerters.put("total_card_fee", totalRoyalpayFee.add(totalTransactionFee)); + parmerters.put("total_incremental_fee", parmerters.getBigDecimal("incremental_fee").add(parmerters.getBigDecimal("incremental_gst"))); dataList.parallelStream().forEach(item -> { BigDecimal incrementalSurcharge = item.containsKey("incremental_surcharge") ? item.getBigDecimal("incremental_surcharge") : BigDecimal.ZERO; BigDecimal taxAmount = item.containsKey("tax_amount") ? item.getBigDecimal("tax_amount") : BigDecimal.ZERO; - BigDecimal royalpaySurhcarge = item.containsKey("royal_surcharge") ? item.getBigDecimal("royal_surcharge") : BigDecimal.ZERO; - BigDecimal surhcargeBack = item.containsKey("surcharge_cashback") ? item.getBigDecimal("surcharge_cashback") : BigDecimal.ZERO; - BigDecimal channelSurcharge = item.containsKey("channel_surcharge") ? item.getBigDecimal("channel_surcharge") : BigDecimal.ZERO; BigDecimal incrementalTax = incrementalSurcharge.divide(new BigDecimal(10), 2, RoundingMode.HALF_UP); BigDecimal transactionFee = item.getBigDecimal("transaction_fee"); BigDecimal transactionFeeTax = item.getBigDecimal("transaction_fee").divide(new BigDecimal(10), 2, RoundingMode.HALF_UP); - BigDecimal royalpayTax = taxAmount.subtract(incrementalTax).subtract(transactionFeeTax); - BigDecimal realRoyalpayCharge = item.getBigDecimal("total_surcharge").add(taxAmount).subtract(transactionFee).subtract(transactionFeeTax); + BigDecimal realRoyalpayCharge = item.getBigDecimal("total_surcharge").add(taxAmount).subtract(transactionFee).subtract(transactionFeeTax).subtract(incrementalSurcharge).subtract(incrementalTax); item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP)); item.put("total_surcharge_intax", realRoyalpayCharge.setScale(2, RoundingMode.HALF_UP)); item.put("transaction_fee_intax", transactionFee.add(transactionFeeTax).setScale(2,RoundingMode.HALF_UP)); @@ -850,9 +855,8 @@ public class TradeLogServiceImpl implements TradeLogService { String fileName = client.getString("client_moniker") + "_Card_Payment_" + parmerters.getString("dateRange").replaceAll("/", ""); response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf"); OutputStream outs = response.getOutputStream(); -// JSONObject clientIncrement = clientIncrementalMapper.findByClinetIdAndChannel(client.getIntValue("client_id"), "RP跨境商城"); -// InputStream jasper = clientIncrement == null ? trans_flow.getInputStream() : incremental_trans_flow.getInputStream(); - InputStream jasper = upay_trans_flow.getInputStream(); + JSONObject clientIncrement = clientIncrementalMapper.findByClinetIdAndChannel(client.getIntValue("client_id"), "RP跨境商城"); + InputStream jasper = clientIncrement == null ? upay_trans_flow.getInputStream() : incremental_upay_trans_flow.getInputStream(); byte[] bytes = JasperRunManager.runReportToPdf(jasper, parmerters, jrDataSource); outs.write(bytes, 0, bytes.length); outs.flush(); diff --git a/src/main/resources/jasper/incremental_partner_upay_invoice_gst.jasper b/src/main/resources/jasper/incremental_partner_upay_invoice_gst.jasper new file mode 100644 index 0000000000000000000000000000000000000000..cf6b40d3dc151a9c554f58ddfd6cfe221baaa6b9 GIT binary patch literal 85632 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 b$%_~`!uN9~T^ literal 0 HcmV?d00001 diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 896b3fc43..c54962cbe 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -390,7 +390,7 @@