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

add 文件上传失败pdf、清除用户缓存

Browse Source
master
luoyang 5 years ago
parent c3abc56b62
commit 0d09e5f1dc
8 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -3327,6 +3327,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
} else {
throw new BadRequestException("please do not repeat submission！");
}
signInAccountService.clearAccountCache(account.getString("account_id"));
}
@Override

6
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
Unescape View File

@ -643,6 +643,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
public JSONObject checkAuthFileStatus(JSONObject client) {
JSONObject result = new JSONObject();
result.put("client_less_file", false);
result.put("put_fail_pdf", "https://file.royalpay.com.au/open/2019/08/27/1566872114763_cdUNdrVcQUoPEzTpdbJ4gkGhO3BstJ.pdf");
if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10) && client.getIntValue("source")!=4) {
List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
boolean clientFilesIsLess = false;
@ -685,14 +686,11 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
List<JSONObject> agreeFile = new ArrayList<>();
agreeFile.add(clientBackToFileUrl.get(0));
fileJson.put("file_value", agreeFile);
fileJson.put("file_write", true);
}else {
fileJson.put("file_value", clientBackToFileUrl);
fileJson.put("file_write", true);
}
}else {
fileJson.put("file_write", true);
}
fileJson.put("file_write", true);
result.put(fileKey,fileJson);
clientFilesIsLess = true;
}

4
src/main/ui/static/payment/partner/partner.js
Unescape View File

@ -1081,7 +1081,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
document.getElementById('loading').style.display="none";
document.getElementById('tip').style.display="none";
delete $scope.logoProgress;
$state.go('basic.compliance_to_perfect');
$state.go('basic.compliance_to_perfect',{reload: true});
window.open(resp.data.file_value,'_blank');
}, function (resp) {
delete $scope.logoProgress;
@ -1093,7 +1093,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
} else {
commonDialog.alert({title: 'Commit Fail', content: '请确认是否签名和已输入全名', type: 'error'});
commonDialog.alert({title: 'Commit Fail', content: 'Please confirm signature and full name entered', type: 'error'});
}
};

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

@ -26,7 +26,7 @@
<p class="form-control-static">
<span ng-if="file.file_company.status==0">待审核</span>
<span ng-if="file.file_company.status==1">通过</span>
<span ng-if="file.file_company.status==2">打回<p class="small text-danger" ng-if="file.file_company.description"> 打回原因：（{{file.file_company.description}}）</p></span>
<span ng-if="file.file_company.status==2">打回<p class="small text-danger" ng-if="file.file_company.description && file.file_company.description!=' '"> 打回原因：（{{file.file_company.description}}）</p></span>
</p>
</div>
</div>

17
src/main/ui/static/payment/partner/templates/compliance_files_advice.html
Unescape View File

@ -1,5 +1,5 @@
<div class="modal-header bg-green">
<h4 style="text-align: center">合规文件补充通知<span ng-if="file.data.client_refuse_reason" style="color:red">({{file.data.client_refuse_reason}})</span></h4>
<h4 style="text-align: center">合规文件补充通知<span ng-if="file.data.client_refuse_reason" style="color:#b55252">({{file.data.client_refuse_reason}})</span></h4>
</div>
<div class="modal-body" style="padding: 30px">
<div class="row">
@ -16,15 +16,11 @@
<div class="form-group">
<!--<label class="control-label col-xs-3">Content</label>-->
<div class="col-xs-12">
<p class="form-control-static">
<p style="text-align: center;"><span
style="text-align: center; font-family: DengXian; font-size: 14px;">RoyalPay</span>Merchant Supplement
Compliance File Notification<span style="text-align: center; font-family: DengXian; font-size: 14px;"></span>
</p>
<p style="text-align: center;"><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">Dear RoyalPay Merchants:</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;"></span></p>
<p class="p1">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&#39;s Foreign Exchange Regulator. To ensure
your business is fully compliant, we require certain documents from you by the 1st of October. If you believe
@ -40,30 +36,19 @@
style="font-family: DengXian; font-size: 14px;">&nbsp;</span><a href="mailto:info@royalpay.com.au"><span
style="font-family: DengXian; color: rgb(0, 0, 255);">info@royalpay.com.au</span></a><span
style="font-family: DengXian; font-size: 14px;">.</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span><span
style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">Best Regards,</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">RoyalPay Customer Service Team</span></p>
<hr/>
<p style="text-align: center;"><span style="font-family: DengXian; font-size: 14px;">RoyalPay皇家支付商户合规文件补充通知</span>
</p>
<p style="text-align: center;"><span style="font-family: DengXian; font-size: 14px;"></span><br/></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">尊敬的RoyalPay商户：</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;"></span></p>
<p class="p1">应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月01日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。</p>
<p class="p1"><br/><span style="font-family: DengXian; font-size: 14px;"></span></p>
<p><span style="font-family: DengXian; font-size: 14px;">RoyalPay客服与技术支持在此期间将竭诚为您服务，如有疑问或需帮助，请拨打我们的客服电话：1300 107 750或添加RoyalPay官方客服号：royalpay_</span><span
style="font-family: DengXian; font-size: 14px;">1</span><span
style="font-family: DengXian; font-size: 14px;">详询。</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">&nbsp;</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">顺颂商祺</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">RoyalPay Customer Service Team</span></p>
<p><br/></p>
<p><br/></p>
</p>
</div>
</div>

7
src/main/ui/static/payment/partner/templates/confirmForSubmit.html
Unescape View File

@ -1,7 +1,12 @@
<style>
*{
font-size: 17px;
}
</style>
<div class="modal-header bg-green">
<h4 style="text-align: center">Do you confirm the submission of the contract?</h4>
</div>
<div class="modal-body" style="padding: 30px">
<div class="modal-body">
<div class="row">
<div class="col-xs-12">
<div class="form-horizontal">

12
src/main/ui/static/payment/partner/templates/contract_for_compliance.html
Unescape View File

@ -41,7 +41,7 @@
}
@media (min-width:100px) and (max-width:399px){
#img1,#img2{width: 60px;height: 45px;}
*{font-size:1px;}
.contract{font-size:1px;}
.return-class {
float: right;
font-size: 17px;
@ -60,7 +60,7 @@
}
@media (min-width:400px) and (max-width:799px){
#img1,#img2{width: 160px;height: 75px;}
*{font-size:5px;}
.contract{font-size:5px;}
.return-class {
float: right;
font-size: 17px;
@ -79,7 +79,7 @@
}
@media (min-width:800px) and (max-width:1024px) {
#img1,#img2{width: 190px;height: 85px;}
*{font-size:10px;}
.contract{font-size:10px;}
.return-class {
float: right;
font-size: 22px;
@ -98,7 +98,7 @@
}
@media (min-width:1025px) and (max-width:1440px) {
#img1,#img2{width: 260px;height: 105px;}
*{font-size:15px;}
.contract{font-size:15px;}
.return-class {
float: right;
font-size: 28px;
@ -117,7 +117,7 @@
}
@media (min-width:1441px) and (max-width:1600px){
#img1,#img2{width: 341px;height: 157px;}
*{font-size:25px;}
.contract{font-size:25px;}
.return-class {
float: right;
font-size: 34px;
@ -139,7 +139,7 @@
<div id="loading" style="width:100%;height:100%;display:none"></div>
<div ui-view autoscroll="true" id = "all">
<div ui-view autoscroll="true" id = "all" class="contract">
<section class="content" style="background:#4F4F4F;">
<div class="row">
<div class="container-fluid">

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

@ -20,6 +20,6 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
<button type="button" class="btn btn-success" ng-click="refusePartnerComplianceFiles();$dismiss();">Refuse</button>
<button type="button" class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
</div>

Write Preview
Loading…
Cancel
Save