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

优化样式、屏蔽下载按钮

Browse Source
master
luoyang 5 years ago
parent 8cb8c5e027
commit 8cd237cd44
10 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -2214,6 +2214,12 @@ public class RetailAppServiceImp implements RetailAppService {
String clientType = device.getString("client_type");
deviceSupport.findRegister(clientType);
JSONObject client = clientMapper.findClient(device.getIntValue("client_id"));
JSONObject account = clientAccountMapper.findById(device.getString("account_id"));
if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
JSONObject cashierResult = new JSONObject();
cashierResult.put("client_less_file", false);
return cashierResult;
}
return signInAccountService.checkAuthFileStatus(client);
}

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

@ -241,6 +241,8 @@ public interface ClientManager {
void deleteAuthFiles(String fileId);
void deleteAuthFilesByAdmin(String fileId);
void uploadAuthFiles(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo);
List<JSONObject> uploadAuthFilesForWaitCompliance(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo);

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

@ -3223,6 +3223,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
clientFilesMapper.deleteByClientAndFileId(fileId);
}
@Override
public void deleteAuthFilesByAdmin(String fileId) {
JSONObject file = clientFilesMapper.findFileById(fileId);
if (file == null) {
throw new BadRequestException("The file has deleted");
}
clientFilesMapper.deleteByClientAndFileId(fileId);
}
@Override
@Transactional
public void uploadAuthFiles(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo) {

2
src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
Unescape View File

@ -536,7 +536,7 @@ public class PartnerManageController {
@ManagerMapping(value = "/auth_file/{fileId}/delete", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER})
public void deleteAuthFiles(@PathVariable String fileId, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
clientManager.deleteAuthFiles(fileId);
clientManager.deleteAuthFilesByAdmin(fileId);
}
@ManagerMapping(value = "/{clientMoniker}/file", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})

17
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -3804,11 +3804,20 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$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) {*/
commonDialog.confirm({
title: 'Warning',
content: 'This operation will delete the file, Are you sure?'
}).then(function () {
$http.put('/sys/partners/auth_file/' + $scope.file_id + '/delete').then(function (resp) {
$state.reload();
commonDialog.alert({
title: 'Success',
content: 'Delete Successful',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
})
};

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

@ -1033,12 +1033,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
}
};
$scope.signContract =function(){
var url = $state.href('compliance_contract',{basicType:8});
window.open(url,'_blank');
}
$scope.goBottom =function() {
window.scrollTo(0, document.documentElement.scrollHeight-document.documentElement.clientHeight);
};

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

@ -53,7 +53,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
app.controller('partnerComplianceCompanyDetail', ['$rootScope', '$scope', '$http', '$state', '$uibModal', 'commonDialog', 'file', function ($rootScope, $scope, $http, $state, $uibModal, commonDialog, file) {
$scope.file = file.data || {};
$scope.partner = $scope.file.client;
$scope.partner.description = {};
$scope.passPartnerComplianceFiles = function () {
$http.put('/compliance/audit/'+$scope.file.client.client_id+'/pass/complianceFile',{}).then(function (resp) {

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

@ -72,6 +72,7 @@
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-4" style="text-align: center;">* bank statement
<span ng-if="file.client_bank_file[0].status == 0" class="small text-dark">(未提交)</span>
<span ng-if="file.client_bank_file[0].status == 1" class="small text-success">(已通过)</span>
<span ng-if="file.client_bank_file[0].status == 2" class="small text-danger">(待审核)</span>
<span ng-if="file.client_bank_file[0].status == 3" class="small text-danger">(已驳回)</span>
@ -94,6 +95,7 @@
<div class="form-group">
<label class="control-label col-sm-4" style="text-align: center;">* Certificate of Registration
<span ng-if="file.client_company_file[0].status == 0" class="small text-dark">(未提交)</span>
<span ng-if="file.client_company_file[0].status == 1" class="small text-success">(已通过)</span>
<span ng-if="file.client_company_file[0].status == 2" class="small text-danger">(待审核)</span>
<span ng-if="file.client_company_file[0].status == 3" class="small text-danger">(已驳回)</span>
@ -115,6 +117,7 @@
<div class="form-group">
<label class="control-label col-sm-4" style="text-align: center;">* ID
<span ng-if="file.client_id_file[0].status == 0" class="small text-dark">(未提交)</span>
<span ng-if="file.client_id_file[0].status == 1" class="small text-success">(已通过)</span>
<span ng-if="file.client_id_file[0].status == 2" class="small text-danger">(待审核)</span>
<span ng-if="file.client_id_file[0].status == 3" class="small text-danger">(已驳回)</span>
@ -136,6 +139,7 @@
<div class="form-group">
<label class="control-label col-sm-4" style="text-align: center;">* Agreement
<span ng-if="file.client_agree_file[0].status == 0" class="small text-dark">(未提交)</span>
<span ng-if="file.client_agree_file[0].status == 1" class="small text-success">(已通过)</span>
<span ng-if="file.client_agree_file[0].status == 2" class="small text-danger">(待审核)</span>
<span ng-if="file.client_agree_file[0].status == 3" class="small text-danger">(已驳回)</span>

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

@ -23,8 +23,6 @@
ng-if="file.client_bank_file.file_write && file.file_company.status != 0 && file.file_company.status!=1">
<i class="fa fa-upload"></i> Upload
</button>
<a ng-if="file.client_bank_file" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_bank_file}}" target="_blank"><i class="fa fa-download"></i></a>
<i class="fa fa-check-square-o check-i" aria-hidden="true" style="float: none" ng-if="$root.complianceCheck.authFile"></i>
</div>
<uib-progressbar value="bankFileProgress.value" ng-if="bankFileProgress"></uib-progressbar>
<!-- <a ng-if="bankIsImage" target="_blank" ng-repeat="src in file.client_bank_file" ng-href="{{src}}">
@ -64,8 +62,6 @@
ng-if="file.client_company_file.file_write && file.file_company.status != 0 && file.file_company.status!=1">
<i class="fa fa-upload"></i> Upload
</button>
<a ng-if="file.client_company_file" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_company_file}}" target="_blank"><i class="fa fa-download"></i></a>
<i class="fa fa-check-square-o check-i" aria-hidden="true" style="float: none" ng-if="$root.complianceCheck.authFile"></i>
</div>
<uib-progressbar value="companyFileProgress.value" ng-if="companyFileProgress"></uib-progressbar>
<!-- <a ng-if="companyIsImage" ng-repeat="src in file.client_company_file" ng-href="{{src}}" target="_blank">
@ -107,8 +103,6 @@
ng-if="file.client_id_file.file_write && file.file_company.status != 0 && file.file_company.status!=1">
<i class="fa fa-upload"></i> Upload
</button>
<a ng-if="file.client_id_file" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_id_file}}" target="_blank"><i class="fa fa-download"></i></a>
<i class="fa fa-check-square-o check-i" aria-hidden="true" style="float: none" ng-if="$root.complianceCheck.authFile"></i>
</div>
<uib-progressbar value="idFileProgress.value" ng-if="idFileProgress"></uib-progressbar>
<!--<a ng-if="idIsImage" ng-repeat="src in file.client_id_file" ng-href="{{src}}" target="_blank">
@ -147,7 +141,20 @@
<label class="control-label col-sm-2">* Agreement</label>
<div class="col-sm-4">
<div class="form-control-static">
<button class="btn btn-success" ng-click="signContract()"type="button" >签订合同</button>
<a role="button" class="btn btn-success" ng-if="file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1" ui-sref="compliance_contract" >重新签订合同</a>
<a role="button" class="btn btn-success" ng-if="!file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1" ui-sref="compliance_contract" >签订合同</a>
<a ng-if="file.client_agree_file.file_value" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_agree_file.file_value[0].file_value}}" target="_blank"><i class="fa fa-download"></i></a>
<table>
<tbody>
<tr ng-repeat="file_src in file.client_agree_file.file_value track by $index">
<td ng-bind="$index+1+'.'" class="btn">1</td>
<td><a ng-if="agreeIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}" class="col-sm-8" onerror="this.src='https://static.easyicon.net/preview/118/1184255.gif'">
</a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)" ng-if="file.client_id_file.file_write && file_src.status !=1 && file.file_company.status != 0 && file.file_company.status!=1 ">X</button>
</td>
</tr>
</tbody></table>
</div>
</div>

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

@ -63,13 +63,6 @@
<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>

Write Preview
Loading…
Cancel
Save