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

[R] 弹窗优化

Browse Source
master
liuxinxin 5 years ago
parent 073bba4e5a
commit 2f9a2b46ef
5 changed files with 137 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -236,10 +236,12 @@ public class KycServiceImpl implements KycService {
fileKeys = fileKeysPassport;
fileNames = fileNamesPassport;
}
for (int i = 0; i < fileKeys.length; i++) {
String fileKey = fileKeys[i];
if (clientAllAuthFiles.stream().noneMatch(fileJson -> fileKey.equals(fileJson.getString("file_name")))) {
throw new BadRequestException("Please check the " + fileNames[i] + " is uploaded completely");
if( !(account.getString("bd_handle") !=null && account.getString("bd_handle").length() > 0) ){
for (int i = 0; i < fileKeys.length; i++) {
String fileKey = fileKeys[i];
if (clientAllAuthFiles.stream().noneMatch(fileJson -> fileKey.equals(fileJson.getString("file_name")))) {
throw new BadRequestException("Please check the " + fileNames[i] + " is uploaded completely");
}
}
}
if ("app".equals(source.toLowerCase())) {

1
src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
Unescape View File

@ -192,6 +192,7 @@ public class SignInController {
public JSONObject partnerLoginStatus(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
partner.put("has_incremental_setvice",clientManager.partnerIncrementalService(partner.getString("client_moniker")).getJSONArray("all_service").size()>0);
partner.put("lessKycFiles",clientManager.isPartnerKycfilesComplete(partner.getString("client_moniker")));
partner.put("complianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")) );
return partner;
}

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

@ -62,7 +62,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
})
};
//todo 这边需要调整 或者关系 不能做两个if,字段放到client里，位置要一致，有bug当补充合规材料提交后不提示弹窗，弹窗样式要修改
if(($scope.currentUser.client.client_less_file ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) {
if(($scope.currentUser.complianceFiles.client_less_file ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) {
$scope.ComplianceToperfect();
complianceNoticeCount++;
}
@ -481,8 +481,19 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
}
}]);
app.controller('partnerFilesCtrl', ['$scope', '$http', '$sce', 'file', 'kycFile', function ($scope, $http, $sce, file , kycFile) {
$scope.file = angular.copy(file);
$scope.kycFile = angular.copy(kycFile);
$scope.file = angular.copy(file.data);
$scope.kycFile = angular.copy(kycFile.data);
var lang = navigator.language || navigator.userLanguage; //常规浏览器语言和IE浏览器
lang = lang.substr(0, 2);
if (lang == 'zh') {
$scope.adviceLanguage = 'zh'
} else {
$scope.adviceLanguage = 'en';
}
$scope.changeLanguage = function (language) {
$scope.adviceLanguage = language;
}
}]);
app.factory('myLoginLogView', ['$uibModal', function ($uibModal) {
return {

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

@ -182,14 +182,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
var partner = angular.copy(obj);
$uibModal.open({
templateUrl: '/static/payment/partner/templates/refuse_reason.html',
controller: 'refusePartnerComplianceFilesCtrl',
controller: 'refusePartnerKycFilesCtrl',
resolve: {
partner: partner
}
})
};
}]);
app.controller('refusePartnerComplianceFilesCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) {
app.controller('refusePartnerKycFilesCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) {
$scope.partner = angular.copy(partner);
$scope.partner.description = "";
@ -202,5 +202,20 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
})
}
}]);
app.controller('refusePartnerComplianceFilesCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) {
$scope.partner = angular.copy(partner);
$scope.partner.description = "";
$scope.refusePartnerComplianceFiles = function () {
var a = $scope.partner.description;
$http.put('/compliance/audit/'+$scope.partner.client_id+'/refuse/complianceFile',{description:$scope.partner.description}).then(function (resp) {
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
}
}]);
return app;
});

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

@ -1,5 +1,6 @@
<div class="modal-header bg-green">
<h4 style="text-align: center">商户资料文件补充通知<span ng-if="kycFile.data.client_refuse_reason" style="color:#b55252">({{kycFile.data.client_refuse_reason}})</span></h4>
<h4 ng-if="adviceLanguage == 'en'" style="text-align: center">Merchant Supplement Compliance File Notification</h4>
<h4 ng-if="adviceLanguage == 'zh'" style="text-align: center">商户资料文件补充通知</h4>
</div>
<div class="modal-body" style="padding: 20px">
<div class="row">
@ -16,7 +17,8 @@
<div class="form-group">
<!--<label class="control-label col-xs-3">Content</label>-->
<div class="col-xs-12">
<a><h5 style="text-align: right">EN | 中文</h5></a>
<a><h5 style="text-align: right"><span ng-click="changeLanguage('en')" style="cursor: pointer;">EN</span> | <span ng-click="changeLanguage('zh')" style="cursor: pointer;">中文</span></h5></a>
<div ng-if="adviceLanguage == 'en'">
<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>
@ -39,7 +41,9 @@
style="font-family: DengXian; font-size: 14px;">.</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">Best Regards,</span></p>
<p><span style="font-family: DengXian; font-size: 14px;">RoyalPay Customer Service Team</span></p>
<hr/>
</div>
<div ng-if="adviceLanguage == 'zh'">
<p style="text-align: center;"><span style="font-family: DengXian; font-size: 14px;">RoyalPay皇家支付商户文件补充通知</span>
</p>
<p><span style="font-family: DengXian; font-size: 14px;">尊敬的RoyalPay商户：</span></p>
@ -51,21 +55,105 @@
style="font-family: DengXian; font-size: 14px;">详询。</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>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-horizontal">
<p>前去补充合规文件:<a ui-sref="compliance_to_perfect" ng-click="$dismiss()">点击前往</a></p>
<p>前去补充KYC文件：<a ui-sref="kyc_files_perfect" ng-click="$dismiss()">点击前往</a></p>
</div>
</div>
<div class="box-body table-responsive" ng-if="adviceLanguage == 'en'">
<table class="table table-bordered table-hover table-striped">
<thead>
<tr><th colspan="4" style="text-align: center">List Of Information To Be Supplemented</th></tr>
<tr>
<th>Supplement Type</th>
<th>Deadline</th>
<th>Status</th>
<th>Operation</th>
</tr>
</thead>
<tbody>
<tr ng-if="file.client_less_file">
<td>Supplement Compliance File</td>
<td>Deadline 2020-01-20</td>
<td>
<p ng-if="file.file_company" style="color: red">
<span ng-if="file.file_company.status == 2">Refused</span>
<span ng-if="file.file_company.description">({{file.file_company.description}})</span>
</p>
<p ng-if=" !file.file_company">
<span>Not Submitted</span>
</p>
</td>
<td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">Go to replenish></a></p></td>
</tr>
<tr ng-if="kycFile.client_less_file">
<td>KYC Certification Information Supplement</td>
<td>Deadline 2020-01-20</td>
<td>
<p ng-if="kycFile.file_company" style="color: red">
<span ng-if="kycFile.file_company.status == 2">Refused</span>
<span ng-if="kycFile.file_company.description">({{kycFile.file_company.description}})</span>
</p>
<p ng-if=" !kycFile.file_company">
<span>Not Submitted</span>
</p>
</td>
<td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">Go to replenish></a></p></td>
</tr>
</tbody>
</table>
</div>
<div class="box-body table-responsive" ng-if="adviceLanguage == 'zh'">
<table class="table table-bordered table-hover table-striped">
<thead>
<tr><th colspan="4" style="text-align: center">待补充资料列表</th></tr>
<tr>
<th>资料类型</th>
<th>截止时间</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-if="file.client_less_file">
<td>合规资料补充</td>
<td>截止时间 2020-01-20</td>
<td>
<p ng-if="file.file_company" style="color: red">
<span ng-if="file.file_company.status == 2">打回</span>
<span ng-if="file.file_company.description">({{file.file_company.description}})</span>
</p>
<p ng-if=" !file.file_company">
<span>未提交</span>
</p>
</td>
<td><p><a ui-sref="compliance_to_perfect" ng-click="$dismiss()">前往补充></a></p></td>
</tr>
<tr ng-if="kycFile.client_less_file">
<td>KYC认证资料补充</td>
<td>截止时间 2020-01-20</td>
<td>
<p ng-if="kycFile.file_company" style="color: red">
<span ng-if="kycFile.file_company.status == 2">打回</span>
<span ng-if="kycFile.file_company.description">({{kycFile.file_company.description}})</span>
</p>
<p ng-if=" !kycFile.file_company">
<span>未提交</span>
</p>
</td>
<td><p><a ui-sref="kyc_files_perfect" ng-click="$dismiss()">前往补充></a></p></td>
</tr>
</tbody>
</table>
</div>
<br/>
<br/>
</div>
<div class="modal-footer">

Write Preview
Loading…
Cancel
Save