add 清算表格增加dev remark

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.15</version>
+    <version>1.3.16</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

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"));
             }

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++) {

src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html

@@ -92,12 +92,12 @@
                                             <select class="form-control" ng-model="file.file_company.id_type" style="width: 250px" ng-change="setSession(file.file_company.id_type)">
                                                 <option value="">Please Choose</option>
                                                 <option value="passport" >Passport</option>
-                                                <option value="driver_license">Driver's license</option>
+                                                <option value="driver_license">Driver license</option>
                                             </select>
                                             <p class="text-info">
                                                 <i class="fa fa-info"></i> Please select the file type for uploading the ID.<br>
                                                 <i class="fa fa-info"></i> Uploading your passport file requires you to upload your utility bill file. <br>
-                                                <i class="fa fa-info"></i> You can upload your driver's license and leave the utility bill file blank. <br>
+                                                <i class="fa fa-info"></i> You can upload your driver license and leave the utility bill file blank. <br>
                                                 <i class="fa fa-info"></i> 请选择上传ID的文件类型.<br>
                                                 <i class="fa fa-info"></i> 上传护照文件需要您上传水电煤账单文件.<br>
                                                 <i class="fa fa-info"></i> 上传驾照,水电煤账单文件可以不填.

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)">
                         <option value="">Please Choose</option>
                         <option value="passport" >Passport</option>
-                        <option value="driver_license">Driver's license</option>
+                        <option value="driver_license">Driver license</option>
                     </select>
                     <div ng-if="!currentUser.lessKycFiles">
                         <p ng-if="file.id_type == 'passport'" >Passport</p>
-                        <p ng-if="file.id_type == 'driver_license' ">Driver's license</p>
+                        <p ng-if="file.id_type == 'driver_license' ">Driver license</p>
                     </div>
                     <p class="text-info">
                         <i class="fa fa-info"></i> Please select the file type for uploading the ID.<br>
                         <i class="fa fa-info"></i> Uploading your passport file requires you to upload your utility bill file. <br>
-                        <i class="fa fa-info"></i> You can upload your driver's license and leave the utility bill file blank. <br>
+                        <i class="fa fa-info"></i> You can upload your driver license and leave the utility bill file blank. <br>
                         <i class="fa fa-info"></i> 请选择上传ID的文件类型.<br>
                         <i class="fa fa-info"></i> 上传护照文件需要您上传水电煤账单文件.<br>
                         <i class="fa fa-info"></i> 上传驾照,水电煤账单文件可以不填.

src/main/ui/static/payment/kyc/templates/partner_kyc_files.html

@@ -59,7 +59,7 @@
                 <div class="col-sm-4">
                     <div class="form-control-static">
                             <p ng-if="file.companyFile.id_type == 'passport'" >Passport</p>
-                            <p ng-if="file.companyFile.id_type == 'driver_license' ">Driver's license</p>
+                            <p ng-if="file.companyFile.id_type == 'driver_license' ">Driver license</p>
                         </select>
                     </div>
                 </div>

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)">
                             <option value="">Please Choose</option>
                             <option value="passport" >Passport</option>
-                            <option value="driver_license">Driver's license</option>
+                            <option value="driver_license">Driver license</option>
                         </select>
                         <p class="text-info">
                             <i class="fa fa-info"></i> If client have already attached surcharge in their own system, ignore this choice.<br>

src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html

@@ -79,7 +79,7 @@
                 <div class="col-sm-6">
                     <div class="form-control-static">
                         <p ng-if="file.file_company.id_type == 'passport'" >Passport</p>
-                        <p ng-if="file.file_company.id_type == 'driver_license' ">Driver's license</p>
+                        <p ng-if="file.file_company.id_type == 'driver_license' ">Driver license</p>
                         </select>
                     </div>
                 </div>