From 9da043de5c5b16886d3fbf522e0ce6b427c9fb50 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 7 Jan 2020 15:11:28 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B8=85=E7=AE=97=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=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