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

优化首页弹窗样式

Browse Source
master
luoyang 5 years ago
parent 42d2356ffa
commit ace8e86a09
5 changed files with 128 additions and 29 deletions
Show Stats Download Patch File Download Diff File

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

@ -84,6 +84,8 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
@Resource
private ClientFilesMapper clientFilesMapper;
@Resource
private ClientComplianceCompanyMapper clientComplianceCompanyMapper;
@Resource
private SmsSender smsSender;
private final String RESET_CLIENT_ACCOUNT_PREFIX = "RESET_CLIENT_ACCOUNT";
private final String RESET_MANAGER_ACCOUNT_PREFIX = "RESET_MANAGER_ACCOUNT";
@ -694,7 +696,12 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
}
}
result.put("client_less_file", clientFilesIsLess);
result.put("client_refuse_reason", "测试驳回！！！");
if (clientFilesIsLess) {
JSONObject authFileCompliance = clientComplianceCompanyMapper.findFileByClientId(client.getIntValue("client_id"));
if (authFileCompliance != null && StringUtils.isNotBlank(authFileCompliance.getString("description"))) {
result.put("client_refuse_reason", authFileCompliance.getString("description"));
}
}
}
}
return result;

7
src/main/ui/static/boot/indexMainApp.js
Unescape View File

@ -19,6 +19,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
var stompClient = null;
var newPartnerGuide_counts = 0;
var pwdcount = 0;
var complianceNoticeCount = 0;
$scope.loadCurrentUser = function () {
$http.get('/global/userstatus/current_partner').then(function (resp) {
$rootScope.currentUser = resp.data;
@ -35,7 +36,6 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
}*/
if ($rootScope.currentUser.is_password_expired && pwdcount == 0) {
commonDialog.confirm({
title: 'Change Password!',
content: 'Your password has been expired,click OK to set a new password'
@ -47,12 +47,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
$scope.ComplianceToperfect = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/compliance_files_advice.html',
backdrop: false
size: 'lg'
})
};
if($scope.currentUser.client.client_less_file)
if($scope.currentUser.client.client_less_file && complianceNoticeCount==0)
{
$scope.ComplianceToperfect();
complianceNoticeCount++;
}
connectWebSocket();
if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) {

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

@ -963,43 +963,58 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
$scope.clientComplianceViewCommit= function () {
if(!$scope.file.client_files.client_agree_file)
if(!$scope.file.client_agree_file)
{
commonDialog.alert({title: 'Error', content: '请提交* Agreement', type: 'error'});
return;
}else if(!$scope.file.client_files.client_id_file)
}else if(!$scope.file.client_id_file)
{
commonDialog.alert({title: 'Error', content:'请提交* ID', type: 'error'});
return;
}else if(!$scope.file.client_files.client_bank_file)
}else if(!$scope.file.client_bank_file)
{
commonDialog.alert({title: 'Error', content: '请提交* bank statement', type: 'error'});
return;
}
else if(!$scope.file.client_files.client_company_file)
else if(!$scope.file.client_company_file)
{
commonDialog.alert({title: 'Error', content: '请提交* Certificate of Registration', type: 'error'});
return;
};
$http.post('/client/partner_info/clientCompliance/' + $scope.partner.client_moniker + '/viewCommit', $scope.file).then(function () {
commonDialog.alert({
title: 'Success',
content: 'Upload Successful',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
commonDialog.confirm({
title: 'Warning',
content: 'Are you sure commit for compliance audit?'
}).then(function () {
$http.post('/client/partner_info/clientCompliance/' + $scope.partner.client_moniker + '/viewCommit', $scope.file).then(function () {
commonDialog.alert({
title: 'Success',
content: 'Commit Successful',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
})
};
$scope.deleteComplianceFiles = function (file_id) {
$scope.file_id = file_id;
/*$http.put('/sys/partners/' + $scope.partner.client_moniker + '/saveAdditional_content', {additional_content: $scope.partner.additional_content}).then(function (resp) {*/
$http.put('/client/partner_info/auth_file/' + $scope.file_id + '/delete').then(function (resp) {
$state.reload();
commonDialog.confirm({
title: 'Warning',
content: 'This operation will delete the file, Are you sure?'
}).then(function () {
$http.put('/client/partner_info/auth_file/' + $scope.file_id + '/delete').then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Delete Successful',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
})
};

3
src/main/ui/static/payment/partner/templates/client_partner_detail.html
Unescape View File

@ -54,8 +54,7 @@
</li>
<li ui-sref-active="active" ng-if="currentUser.client.client_less_file">
<a ui-sref=".compliance_to_perfect">Compliance to perfect</a>
<p ngif app>(资料审核中)</p>
<a ui-sref=".compliance_to_perfect">Compliance Files</a>
</li>
</ul>

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

@ -1,11 +1,88 @@
<div class="modal-header">
<h4>ADVICE</h4>
<div class="modal-header bg-green">
<h4 style="text-align: center">合规文件补充通知</h4>
</div>
<div class="modal-body">
商户合规资料不全，请补充商户资料
<div class="modal-body" style="padding: 30px">
<div class="row">
<div class="col-xs-12">
<div class="form-horizontal">
<!--<div class="form-group">-->
<!--&lt;!&ndash;<label class="control-label col-xs-3">Title</label>&ndash;&gt;-->
<!--<div class="col-xs-12">-->
<!--<p class="form-control-static">-->
<!--{{notice.title}}-->
<!--</p>-->
<!--</div>-->
<!--</div>-->
<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
you may not be able to submit these documents on time please get in touch with us as soon as possible.</p>
<p><br/><span style="font-family: DengXian; font-size: 14px;"></span></p>
<p><span
style="font-family: DengXian; font-size: 14px;">If you have any questions or issues related to this&nbsp;</span><span
style="font-family: DengXian; font-size: 14px;">adjustment,</span><span
style="font-family: DengXian; font-size: 14px;">&nbsp;please don</span><span
style="font-family: DengXian; font-size: 14px;">’</span><span
style="font-family: DengXian; font-size: 14px;">t hesitate to call 1300 107 750 or&nbsp;</span><span
style="font-family: DengXian; font-size: 14px;">email</span><span
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;">在此期间给您造成的不便，我们深表歉意，感谢您的理解与支持。</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><span style="font-family: DengXian; font-size: 14px;">201</span><span
style="font-family: DengXian; font-size: 14px;">9</span><span
style="font-family: DengXian; font-size: 14px;">年</span><span
style="font-family: DengXian; font-size: 14px;">8</span><span
style="font-family: DengXian; font-size: 14px;">月</span><span
style="font-family: DengXian; font-size: 14px;">6</span><span
style="font-family: DengXian; font-size: 14px;">日</span></p>
<p><br/></p>
<p><br/></p>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-success" ui-sref="basic.compliance_to_perfect" ng-click="$dismiss()" type="button">Compliance Files</button>
<button class="btn btn-success" ui-sref="basic.compliance_to_perfect" ng-click="$dismiss()" type="button">Supplementary Files
</button>
<button class="btn btn-danger" ng-click="$dismiss()" type="button">Cancel</button>
</div>

Write Preview
Loading…
Cancel
Save