From 473b965151fbda58fde25563a5a2756f58a8fca6 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 3 Jan 2020 16:06:44 +0800 Subject: [PATCH 01/10] app message sending api update --- .../payment/manage/appclient/beans/RetailAppMessage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailAppMessage.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailAppMessage.java index 2a2e45986..0160843e3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailAppMessage.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailAppMessage.java @@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder; import au.com.royalpay.payment.manage.pushMessage.bean.AppMessageType; import au.com.royalpay.payment.tools.device.message.AppMessage; import au.com.royalpay.payment.tools.env.RequestEnvironment; +import au.com.royalpay.payment.tools.permission.enums.PartnerRole; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; @@ -21,7 +22,7 @@ public class RetailAppMessage { JSONObject msg = new JSONObject(); msg.put("appid", appid); msg.put("client_id", clientId); - msg.put("role", "admin"); + msg.put("role", PartnerRole.ADMIN.getCode()); msg.put("title", title); msg.put("body", body); msg.put("send_time", new Date()); From 233701e4503b553a8f15a79416b0a0a54f42b15f Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 3 Jan 2020 16:12:52 +0800 Subject: [PATCH 02/10] app message sending api update --- .../payment/manage/mappers/system/ClientDeviceTokenMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java index f9aaec11f..1b2b301b5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java @@ -24,7 +24,7 @@ public interface ClientDeviceTokenMapper { List listTokensByClient_id(@Param("client_id") int client_id); - List listTokensByAccountId(@Param("client_id") String accountId); + List listTokensByAccountId(@Param("account_id") String accountId); List listAllTokens(JSONObject devToken); From d7cae44e8a9b2855db97373b045fa24c548f2d06 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 3 Jan 2020 16:18:58 +0800 Subject: [PATCH 03/10] app message sending api update --- .../payment/manage/mappers/system/ClientDeviceTokenMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.xml index 7ffa9c3b2..75354ab53 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.xml @@ -20,7 +20,6 @@ FROM sys_clients_devices_token t INNER JOIN sys_clients_devices d ON t.dev_id = d.dev_id and d.account_id=#{account_id} and d.is_offline=0 WHERE t.is_valid = 1 - GROUP BY token - \ No newline at end of file + From 36bb909d06d85621066cc1f0ab2e058b233312d9 Mon Sep 17 00:00:00 2001 From: yixian Date: Mon, 6 Jan 2020 17:37:27 +0800 Subject: [PATCH 08/10] update apns certificate --- src/main/resources/apple_message_cert_dev.p12 | Bin 3252 -> 3191 bytes .../payment/manage/valid/APNSTest.java | 46 ++++++++++++++++++ src/test/resources/apple_message_cert_dev.p12 | Bin 0 -> 3191 bytes 3 files changed, 46 insertions(+) create mode 100644 src/test/java/au/com/royalpay/payment/manage/valid/APNSTest.java create mode 100644 src/test/resources/apple_message_cert_dev.p12 diff --git a/src/main/resources/apple_message_cert_dev.p12 b/src/main/resources/apple_message_cert_dev.p12 index a16115826b5fb51d06e05a404ee1606c5151922e..922b88d93d3885a5c634c205466c1f2c2538f665 100644 GIT binary patch delta 3160 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 delta 3222 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 IicpF diff --git a/src/test/java/au/com/royalpay/payment/manage/valid/APNSTest.java b/src/test/java/au/com/royalpay/payment/manage/valid/APNSTest.java new file mode 100644 index 000000000..df0dea049 --- /dev/null +++ b/src/test/java/au/com/royalpay/payment/manage/valid/APNSTest.java @@ -0,0 +1,46 @@ +package au.com.royalpay.payment.manage.valid; + +import au.com.royalpay.payment.tools.device.message.AppMessage; +import au.com.royalpay.payment.tools.exceptions.ServerErrorException; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.notnoop.apns.APNS; +import com.notnoop.apns.ApnsService; +import org.apache.commons.lang3.StringUtils; +import org.junit.Test; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.UUID; + +/** + * Create by davep at 2020-01-06 16:04 + */ +public class APNSTest { + @Test + public void test() throws IOException { + String appleMessagePassword = "BSNMNkxPq0AT"; + AppMessage msg = new AppMessage("MESSAGE","test","test content"); + JSONObject data = new JSONObject(); + data.put("send_type","rloan_creditFinished"); + msg.setData(data); + JSONObject typeData = new JSONObject(); + typeData.put("send_type","MESSAGE"); + typeData.put("id", UUID.randomUUID().toString()); + msg.setTypeData(typeData); + URL cert = getClass().getClassLoader().getResource("rloan_dev_apns.p12"); + try(InputStream keyIns = cert.openStream()) { + ApnsService service = APNS.newService().withCert(keyIns, appleMessagePassword) + .withSandboxDestination().build(); + String payload = APNS.newPayload().alertTitle("test").alertBody("test") + .badge(1).sound("default").customField("data", msg.getData()).customField("type", msg.getTypeData()).build(); + JSONObject p = JSON.parseObject(payload); + JSONObject aps = p.getJSONObject("aps"); + aps.put("mutable-content", "1"); + service.push("486A623E9A5AC2EB28DFBF3C827979293E9E9F9E1252603E7E1F8C878695FA57", p.toJSONString()); + } + } +} diff --git a/src/test/resources/apple_message_cert_dev.p12 b/src/test/resources/apple_message_cert_dev.p12 new file mode 100644 index 0000000000000000000000000000000000000000..922b88d93d3885a5c634c205466c1f2c2538f665 GIT binary patch literal 3191 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 Uzg-$26JBFHpPVWZO$z}07ZtDP1^@s6 literal 0 HcmV?d00001 From bc49f7667d39a36cf279c04b17639e13fb0e966a Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Tue, 7 Jan 2020 10:00:31 +0800 Subject: [PATCH 09/10] [R] fix --- pom.xml | 2 +- src/main/resources/i18n/msg_en.properties | 2 +- src/main/resources/i18n/msg_zh.properties | 2 +- .../static/payment/kyc/templates/bd_help_client_progress.html | 4 ++-- .../payment/partner/templates/compliance_files_advice.html | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3e2437766..5fef248dc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.14 + 1.3.15 UTF-8 1.4.0 diff --git a/src/main/resources/i18n/msg_en.properties b/src/main/resources/i18n/msg_en.properties index 17226cb41..2f70ad449 100644 --- a/src/main/resources/i18n/msg_en.properties +++ b/src/main/resources/i18n/msg_en.properties @@ -115,7 +115,7 @@ contract.old.waring=Dear Valued Merchants ，to ensure we comply with the ATO, w sys.mondelay.cancel.waring=Are you sure to quit this activity? -client.auth.file.title=RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. To ensure your business is fully compliant, we require certain documents from you by the 31st of October. If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible. +client.auth.file.title=RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. To ensure your business is fully compliant, we require certain documents from you by the February 29. If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible. client.auth.file.aggregate.title=Notice Of Supplementary Files client.auth.file.compliance.type=2019-10 KYC Certification Information Supplement(1) client.auth.file.kyc.type=2020-01 KYC Certification Information Supplement(2) diff --git a/src/main/resources/i18n/msg_zh.properties b/src/main/resources/i18n/msg_zh.properties index c3c1563a3..4bf1ef276 100644 --- a/src/main/resources/i18n/msg_zh.properties +++ b/src/main/resources/i18n/msg_zh.properties @@ -108,7 +108,7 @@ sys.contract.info=尊敬的商户，您与ROYALPAY的服务合同已到期，为 contract.old.waring=尊敬的商户，RoyalPay于近期正式收到澳洲监管机构的通知，应澳大利亚税务局ATO的要求进行了合同上GST部分的相应调整。请仔细阅读合同条款并确认。 sys.mondelay.cancel.waring=是否确认退出活动 -client.auth.file.title=应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月31日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。 +client.auth.file.title=应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2020年2月29日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。 client.auth.file.aggregate.title=补充材料通知 client.auth.file.compliance.type=2019-10月KYC材料认证补充(1) client.auth.file.kyc.type=2020-01月KYC材料认证补充(2) diff --git a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html index 6cfecbe3f..6f595729e 100644 --- a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html +++ b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html @@ -71,7 +71,7 @@ - @@ -117,7 +117,7 @@ - diff --git a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html index bfa4864ce..604a0c09d 100644 --- a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html +++ b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html @@ -23,7 +23,7 @@

Dear RoyalPay Merchants:

RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this - we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. If you believe + we regularly participate in communication with Austrac and China's Foreign Exchange Regulator.To ensure your business is fully compliant, we require certain documents from you by the February 29.If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible.


RoyalPay皇家支付商户文件补充通知

尊敬的RoyalPay商户：

-

应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，超期未提交将可能会影响您的正常交易，谢谢您的配合。

+

应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2020年2月29日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。


RoyalPay客服与技术支持在此期间将竭诚为您服务，如有疑问或需帮助，请拨打我们的客服电话：1300 107 750或添加RoyalPay官方客服号：royalpay_1 Date: Tue, 7 Jan 2020 15:11:28 +0800 Subject: [PATCH 10/10] =?UTF-8?q?add=20=E6=B8=85=E7=AE=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=A2=9E=E5=8A=A0dev=20remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 9 +++++++++ .../management/clearing/core/impl/CleanServiceImpl.java | 8 ++++++-- .../payment/kyc/templates/bd_help_client_progress.html | 4 ++-- .../payment/kyc/templates/client_kyc_files_progress.html | 6 +++--- .../static/payment/kyc/templates/partner_kyc_files.html | 2 +- .../partner/templates/client_compliance_files.html | 2 +- .../partner/templates/client_kyc_files_to_auth.html | 2 +- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 5fef248dc..0c1243618 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.15 + 1.3.16 UTF-8 1.4.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 9be9a2a6d..b0be6d024 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 @@ -2507,6 +2507,12 @@ public class RetailAppServiceImp implements RetailAppService { if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) { authFileStatus.put("client_less_file", false); } + JSONObject compliance = clientComplianceCompanyMapper.findFileByClientId(account.getIntValue("client_id")); + if (compliance != null) { + if (compliance.getIntValue("status")==0 || compliance.getIntValue("status")==1) { + authFileStatus.put("client_less_file", false); + } + } return authFileStatus; } @@ -2620,6 +2626,9 @@ public class RetailAppServiceImp implements RetailAppService { complianceFilesNotice.put("type", messageSource.getMessage("client.auth.file.compliance.type", null, RequestEnvironment.getLocale())); complianceFilesNotice.put("client_less_file",complianceFileStatus.getBoolean("client_less_file")); if(compliance != null){ + if (compliance.getIntValue("status")==0 || compliance.getIntValue("status")==1) { + complianceFilesNotice.put("client_less_file", false); + } if(complianceFileStatus.getBoolean("client_less_file")){ complianceFilesNotice.put("client_refuse_reason",compliance.getString("description")); } diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 7f6b6806d..7e65da9dd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -838,7 +838,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider int rowNum = 0; Row row = sheet.createRow(rowNum); String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency", - "Input Amount", "Total Amount", "Clearing Amount(AUD)", "Sruchange Rate", "Surcharge(AUD)", "GST(AUD)", "Settle Amount(AUD)", "Remark", "Dev No"}; + "Input Amount", "Total Amount", "Clearing Amount(AUD)", "Sruchange Rate", "Surcharge(AUD)", "GST(AUD)", "Settle Amount(AUD)", "Remark", "Dev No","Dev Remark"}; String[] analysis = {"Total Credit(AUD)", "Total Debit(AUD)", "Gross Amount(AUD)", "Total GST(AUD)", "Total Charge(AUD)", "Net Amount(AUD)"}; for (int i = 0; i < title.length; i++) { row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]); @@ -900,9 +900,13 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("order_detail")); String clientDevId = StringUtils.defaultString(settle.getString("dev_id"), "-"); JSONObject device = clientDeviceMapper.find(settle.getString("dev_id")); - if (device != null) + String clientDevRemark = "-"; + if (device != null) { clientDevId = device.getString("client_dev_id"); + clientDevRemark = device.getString("remark"); + } row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(clientDevId); + row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(clientDevRemark); } row = sheet.createRow(++rowNum); for (int i = 0; i < analysis.length; i++) { diff --git a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html index 6f595729e..658c733da 100644 --- a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html +++ b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html @@ -92,12 +92,12 @@

Please select the file type for uploading the ID.
Uploading your passport file requires you to upload your utility bill file.
- You can upload your driver's license and leave the utility bill file blank.
+ You can upload your driver license and leave the utility bill file blank.
请选择上传ID的文件类型.
上传护照文件需要您上传水电煤账单文件.
上传驾照,水电煤账单文件可以不填. diff --git a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html index 14508f1b8..34d84fc6e 100644 --- a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html +++ b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html @@ -62,16 +62,16 @@ ng-model="file.id_type" style="width: 250px" ng-change="setSession(file.id_type)"> - +

Passport

-

Driver's license

+

Driver license

Please select the file type for uploading the ID.
Uploading your passport file requires you to upload your utility bill file.
- You can upload your driver's license and leave the utility bill file blank.
+ You can upload your driver license and leave the utility bill file blank.
请选择上传ID的文件类型.
上传护照文件需要您上传水电煤账单文件.
上传驾照,水电煤账单文件可以不填. diff --git a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html index 319bd889b..2b83f323c 100644 --- a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html +++ b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html @@ -59,7 +59,7 @@

Passport

-

Driver's license

+

Driver license

diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_files.html b/src/main/ui/static/payment/partner/templates/client_compliance_files.html index e8dd8a539..7dfb73822 100644 --- a/src/main/ui/static/payment/partner/templates/client_compliance_files.html +++ b/src/main/ui/static/payment/partner/templates/client_compliance_files.html @@ -70,7 +70,7 @@ ng-model="file.id_type" style="width: 250px" ng-change="setSession(file.id_type)"> - +

If client have already attached surcharge in their own system, ignore this choice.
diff --git a/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html b/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html index bca089e7c..cc34ada65 100644 --- a/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html +++ b/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html @@ -79,7 +79,7 @@

Passport

-

Driver's license

+

Driver license