msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[R]fix

Browse Source
master
liuxinxin 5 years ago
parent db1f6275e5
commit 514cfa899f
6 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java
Unescape View File

@ -84,9 +84,7 @@ public class KycServiceImpl implements KycService {
public JSONObject getKycDashboard(JSONObject manager) {
JSONObject params = new JSONObject();
JSONObject result = new JSONObject();
if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
params.put("bd_user", manager.getString("manager_id"));
}
checkManagerPermission(manager,params,null);
List<JSONObject> needHelps = clientComplianceCompanyMapper.listNeedHelpClients(params);
result.put("total_need_help", needHelps != null ? needHelps.size() : 0);
result.put("total_partner", clientMapper.countKycClients(params));

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -3458,6 +3458,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
List<JSONObject> clientFiles = clientFilesMapper.findClientFile(client.getIntValue("client_id"));
JSONObject fileJson = new JSONObject();
JSONObject companyFile = clientComplianceCompanyMapper.findKycFileByClientId(client.getIntValue("client_id"));
fileJson.put("companyFile",companyFile);
if (clientFiles != null && clientFiles.size() > 0) {
for (String fileKey : fileKeys) {
List<JSONObject> clientFileUrl = clientFiles.stream()

10
src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html
Unescape View File

@ -166,11 +166,13 @@
<div class="col-sm-12">
<p class="col-sm-6">Example：公司请提供以下文件图片,如示例
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488865011738_mW91ylSb5V1NJYu8jxvBPGNN49Zyel.jpeg">
src="https://file.royalpay.com.au/open/2019/12/16/1576491226098_Ho29fpS08rNP9AvPTZQfyoIrNa9bcB.png" title="" alt="水费.png"/>
<br/><img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491263193_hqD9DkQOZvqx8Qaw1ABIkqL21aSNrd.jpg" title="" alt="电费.jpg"/>
</p>
<p class="col-sm-6">sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传
<img class="col-sm-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488860564017_37spL6phUySM27oRtO4cQ7FOJblYJ6.jpeg">
<p class="col-sm-6">
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491285195_C8oXVU4QIJ3ADDEMghaNXTt3cXUhtd.png" title="" alt="煤气.png"/>
</p>
</div>
</div>

12
src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html
Unescape View File

@ -22,7 +22,7 @@
({{file.file_company.description}})</span>
</h1>
<br/>
<p ng-if="currentUser.client.client_less_file && currentUser.lessKycFiles">前去补充合规文件:<a ui-sref="compliance_to_perfect">点击前往</a></p>
<p ng-if="currentUser.complianceFiles.client_less_file && currentUser.lessKycFiles">前去补充合规文件:<a ui-sref="compliance_to_perfect">点击前往</a></p>
</section>
<div class="panel-body box box-warning ng-scope" style="margin-top: 20px;">
<div class="form-horizontal">
@ -132,11 +132,13 @@
<div class="col-sm-12">
<p class="col-sm-6">Example：公司请提供以下文件图片,如示例
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488865011738_mW91ylSb5V1NJYu8jxvBPGNN49Zyel.jpeg">
src="https://file.royalpay.com.au/open/2019/12/16/1576491226098_Ho29fpS08rNP9AvPTZQfyoIrNa9bcB.png" title="" alt="水费.png"/>
<br/><img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491263193_hqD9DkQOZvqx8Qaw1ABIkqL21aSNrd.jpg" title="" alt="电费.jpg"/>
</p>
<p class="col-sm-6">sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传
<img class="col-sm-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488860564017_37spL6phUySM27oRtO4cQ7FOJblYJ6.jpeg">
<p class="col-sm-6">
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491285195_C8oXVU4QIJ3ADDEMghaNXTt3cXUhtd.png" title="" alt="煤气.png"/>
</p>
</div>
</div>

37
src/main/ui/static/payment/kyc/templates/partner_kyc_files.html
Unescape View File

@ -5,6 +5,13 @@
</style>
<div class="panel panel-default">
<div class="panel-heading">KYC Files &nbsp;&nbsp;&nbsp;
<span ng-if="!file.companyFile">(未提交)</span>
<span ng-if="file.companyFile">
<span ng-if="file.companyFile.status == 9">(bd帮助)</span>
<span ng-if="file.companyFile.status == 0">(待审核)</span>
<span ng-if="file.companyFile.status == 1">(已通过)</span>
<span ng-if="file.companyFile.status == 2">(已打回)</span>
</span>
<!--<a class="btn-group btn btn-success" ng-if="file" ng-href="{{downloadAsZip()}}" target="_blank">
<i class="fa fa-cloud-download">一键下载</i>
</a>-->
@ -50,6 +57,17 @@
</div>
</div>
<div class="form-group" ng-if="file.companyFile">
<label class="control-label col-sm-2">* ID Type </label>
<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>
</select>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">* ID </label>
<div class="col-sm-4">
@ -125,17 +143,28 @@
<div class="col-sm-12">
<p class="col-sm-6">Example：公司请提供以下文件图片,如示例
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488865011738_mW91ylSb5V1NJYu8jxvBPGNN49Zyel.jpeg">
src="https://file.royalpay.com.au/open/2019/12/16/1576491226098_Ho29fpS08rNP9AvPTZQfyoIrNa9bcB.png" title="" alt="水费.png"/>
<br/><img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491263193_hqD9DkQOZvqx8Qaw1ABIkqL21aSNrd.jpg" title="" alt="电费.jpg"/>
</p>
<p class="col-sm-6">sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传
<img class="col-sm-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488860564017_37spL6phUySM27oRtO4cQ7FOJblYJ6.jpeg">
<p class="col-sm-6">
<img class="col-xs-12" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2019/12/16/1576491285195_C8oXVU4QIJ3ADDEMghaNXTt3cXUhtd.png" title="" alt="煤气.png"/>
</p>
</div>
</div>
</div>
</div>
<div class="form-group" ng-if="file.companyFile && file.companyFile.bd_handle">
<label class="control-label col-sm-2"> 无法提供材料原因:</label>
<div class="col-sm-4">
<div class="form-control-static">
<textarea class="form-control" ng-model="file.companyFile.bd_handle" style="height: 150px" id="bd-handle" readonly></textarea>
</div>
</div>
</div>
</div>
</div>
<div style="text-align: center">

2
src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html
Unescape View File

@ -22,7 +22,7 @@
({{file.client_refuse_reason}})</span>
</h1>
<br/>
<p ng-if="currentUser.client.client_less_file && currentUser.lessKycFiles">前去补充KYC文件：<a ui-sref="kyc_files_perfect">点击前往</a></p>
<p ng-if="currentUser.complianceFiles.client_less_file && currentUser.lessKycFiles">前去补充KYC文件：<a ui-sref="kyc_files_perfect">点击前往</a></p>
</section>
<div class="panel-body box box-warning ng-scope" style="margin-top: 20px;">
<div class="form-horizontal">

Write Preview
Loading…
Cancel
Save