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

[R] 细节优化

Browse Source
master
liuxinxin 5 years ago
parent 514cfa899f
commit 6513f627f8
11 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File

15
src/main/java/au/com/royalpay/payment/manage/kyc/bean/KycPartnersQuery.java
Unescape View File

@ -7,18 +7,19 @@ import org.apache.commons.lang3.StringUtils;
* Created by yishuqian on 8/30/16. * Created by yishuqian on 8/30/16.
*/ */
public class KycPartnersQuery { public class KycPartnersQuery {
private String clientMoniker; private String client_moniker;
private String status; private String status;
private int page = 1; private int page = 1;
private int limit = 10; private int limit = 10;
private boolean onlyMe = false; private boolean onlyMe = false;
public String getClientMoniker() {
return clientMoniker; public String getClient_moniker() {
return client_moniker;
} }
public void setClientMoniker(String title) { public void setClient_moniker(String client_moniker) {
this.clientMoniker = title; this.client_moniker = client_moniker;
} }
public String getStatus() { public String getStatus() {
@ -55,8 +56,8 @@ public class KycPartnersQuery {
public JSONObject toJsonParam() { public JSONObject toJsonParam() {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
if (StringUtils.isNotBlank(clientMoniker)) { if (StringUtils.isNotBlank(client_moniker)) {
param.put("clientMoniker", getClientMoniker()); param.put("client_moniker", getClient_moniker());
} }
if (StringUtils.isNotBlank(status)) { if (StringUtils.isNotBlank(status)) {
param.put("status", getStatus()); param.put("status", getStatus());

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

@ -192,7 +192,7 @@ public class SignInController {
public JSONObject partnerLoginStatus(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) { 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("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("lessKycFiles",clientManager.isPartnerKycfilesComplete(partner.getString("client_moniker")));
partner.put("complianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")) ); partner.put("lessComplianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")).getBoolean("client_less_file") );
return partner; return partner;
} }

1
src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml
Unescape View File

@ -14,6 +14,7 @@
<if test="type!=null"> <if test="type!=null">
and a.type = #{type} and a.type = #{type}
</if> </if>
and a.status != 9
</where> </where>
</select> </select>

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

@ -62,7 +62,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
}) })
}; };
//todo 这边需要调整 或者关系 不能做两个if,字段放到client里，位置要一致，有bug当补充合规材料提交后不提示弹窗，弹窗样式要修改 //todo 这边需要调整 或者关系 不能做两个if,字段放到client里，位置要一致，有bug当补充合规材料提交后不提示弹窗，弹窗样式要修改
if(($scope.currentUser.complianceFiles.client_less_file ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) { if(($scope.currentUser.lessComplianceFiles ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) {
$scope.ComplianceToperfect(); $scope.ComplianceToperfect();
complianceNoticeCount++; complianceNoticeCount++;
} }

9
src/main/ui/static/payment/kyc/kyc-manage.js
Unescape View File

@ -39,6 +39,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
$scope.loadClientProgressing = function (page,status) { $scope.loadClientProgressing = function (page,status) {
var params = angular.copy($scope.params); var params = angular.copy($scope.params);
params.status = status; params.status = status;
params.client_moniker = params.progress_client_moniker;
params.page = page || $scope.progressPagination.page || 1; params.page = page || $scope.progressPagination.page || 1;
$http.get('/sys/kyc/manage/partner/progressing', {params: params}).then(function (resp) { $http.get('/sys/kyc/manage/partner/progressing', {params: params}).then(function (resp) {
$scope.approving = resp.data.data; $scope.approving = resp.data.data;
@ -48,6 +49,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
$scope.loadClientCompleted = function (page) { $scope.loadClientCompleted = function (page) {
var params = angular.copy($scope.params); var params = angular.copy($scope.params);
params.client_moniker = params.completed_client_moniker;
params.page = page || $scope.completedPagination.page || 1; params.page = page || $scope.completedPagination.page || 1;
$http.get('/sys/kyc/manage/partner/completed', {params: params}).then(function (resp) { $http.get('/sys/kyc/manage/partner/completed', {params: params}).then(function (resp) {
$scope.completed_contract = resp.data.data; $scope.completed_contract = resp.data.data;
@ -142,6 +144,13 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
}]); }]);
app.controller('bdHelpKYCProgressCtrl', [ '$scope', '$http', '$state', 'file', 'commonDialog', '$location', '$anchorScroll','Upload',function ($scope, $http, $state, file, commonDialog, $location, $anchorScroll, Upload) { app.controller('bdHelpKYCProgressCtrl', [ '$scope', '$http', '$state', 'file', 'commonDialog', '$location', '$anchorScroll','Upload',function ($scope, $http, $state, file, commonDialog, $location, $anchorScroll, Upload) {
$scope.file = angular.copy(file.data) || {}; $scope.file = angular.copy(file.data) || {};
if(!$scope.file.file_company.id_type){
$scope.file.file_company.id_type = sessionStorage.getItem($scope.file.client.client_moniker+'_idType');
}
$scope.setSession = function(idType){
sessionStorage.setItem($scope.file.client.client_moniker+'_idType',idType);
}
$scope.uploadBankFile = function (file) { $scope.uploadBankFile = function (file) {
if (file != null) { if (file != null) {
if (file.size > 3 * 1024 * 1024) { if (file.size > 3 * 1024 * 1024) {

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

@ -22,10 +22,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
if($scope.file.file_company){ if($scope.file.file_company){
$scope.file.id_type = $scope.file.file_company.id_type||""; $scope.file.id_type = $scope.file.file_company.id_type||"";
}else{ }else{
$scope.file.id_type = ""; $scope.file.id_type = sessionStorage.getItem($scope.partner.client_moniker+'_idType');
} }
$scope.file.need_bd = true; $scope.file.need_bd = true;
$scope.setSession = function(idType){
sessionStorage.setItem($scope.partner.client_moniker+'_idType',idType);
}
//audit files //audit files
$scope.uploadBankFile = function (file) { $scope.uploadBankFile = function (file) {
if (file != null) { if (file != null) {

4
src/main/ui/static/payment/kyc/templates/bd_client_progress.html
Unescape View File

@ -177,7 +177,7 @@
<label class="col-xs-4 col-sm-2 control-label">Partner Code</label> <label class="col-xs-4 col-sm-2 control-label">Partner Code</label>
<div class="col-sm-5 col-xs-8"> <div class="col-sm-5 col-xs-8">
<input class="form-control" placeholder="" ng-click="loadClientProgressing(1)" <input class="form-control" placeholder="" ng-click="loadClientProgressing(1)"
ng-model="params.client_moniker"> ng-model="params.progress_client_moniker">
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group col-xs-12">
@ -292,7 +292,7 @@
<label class="col-xs-4 col-sm-2 control-label">Partner Code</label> <label class="col-xs-4 col-sm-2 control-label">Partner Code</label>
<div class="col-sm-5 col-xs-8"> <div class="col-sm-5 col-xs-8">
<input class="form-control" placeholder="" ng-click="loadClientCompleted(1)" <input class="form-control" placeholder="" ng-click="loadClientCompleted(1)"
ng-model="params.client_moniker"> ng-model="params.completed_client_moniker">
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group col-xs-12">

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

@ -89,7 +89,7 @@
<label class="control-label col-sm-3">* Choose ID Type </label> <label class="control-label col-sm-3">* Choose ID Type </label>
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-control-static"> <div class="form-control-static">
<select class="form-control" ng-model="file.file_company.id_type" style="width: 250px"> <select class="form-control" ng-model="file.file_company.id_type" style="width: 250px" ng-change="setSession(file.file_company.id_type)">
<option value="">Please Choose</option> <option value="">Please Choose</option>
<option value="passport" >Passport</option> <option value="passport" >Passport</option>
<option value="driver_license">Driver's license</option> <option value="driver_license">Driver's license</option>

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

@ -22,7 +22,7 @@
({{file.file_company.description}})</span> ({{file.file_company.description}})</span>
</h1> </h1>
<br/> <br/>
<p ng-if="currentUser.complianceFiles.client_less_file && currentUser.lessKycFiles">前去补充合规文件:<a ui-sref="compliance_to_perfect">点击前往</a></p> <p ng-if="currentUser.lessComplianceFiles && currentUser.lessKycFiles">前去补充合规文件:<a ui-sref="compliance_to_perfect">点击前往</a></p>
</section> </section>
<div class="panel-body box box-warning ng-scope" style="margin-top: 20px;"> <div class="panel-body box box-warning ng-scope" style="margin-top: 20px;">
<div class="form-horizontal"> <div class="form-horizontal">
@ -55,7 +55,7 @@
<label class="control-label col-sm-3">* Choose ID Type </label> <label class="control-label col-sm-3">* Choose ID Type </label>
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-control-static"> <div class="form-control-static">
<select class="form-control" ng-model="file.id_type" style="width: 250px"> <select class="form-control" ng-model="file.id_type" style="width: 250px" ng-change="setSession(file.id_type)">
<option value="">Please Choose</option> <option value="">Please Choose</option>
<option value="passport" >Passport</option> <option value="passport" >Passport</option>
<option value="driver_license">Driver's license</option> <option value="driver_license">Driver's license</option>

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

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

@ -1,3 +1,10 @@
<style>
.selectedLanguage{
background:#FF9;color:red;
}
</style>
<div class="modal-header bg-green"> <div class="modal-header bg-green">
<h4 ng-if="adviceLanguage == 'en'" style="text-align: center">Merchant Supplement Compliance File Notification</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> <h4 ng-if="adviceLanguage == 'zh'" style="text-align: center">商户资料文件补充通知</h4>
@ -17,7 +24,7 @@
<div class="form-group"> <div class="form-group">
<!--<label class="control-label col-xs-3">Content</label>--> <!--<label class="control-label col-xs-3">Content</label>-->
<div class="col-xs-12"> <div class="col-xs-12">
<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> <a><h5 style="text-align: right"><span ng-click="changeLanguage('en')" ng-class="{'selectedLanguage':adviceLanguage == 'en'}"style="cursor: pointer;">EN</span> | <span ng-click="changeLanguage('zh')" ng-class="{'selectedLanguage':adviceLanguage == 'zh'}" style="cursor: pointer;">中文</span></h5></a>
<div ng-if="adviceLanguage == 'en'"> <div ng-if="adviceLanguage == 'en'">
<p style="text-align: center;"><span <p style="text-align: center;"><span
style="text-align: center; font-family: DengXian; font-size: 14px;">RoyalPay</span>Merchant Supplement style="text-align: center; font-family: DengXian; font-size: 14px;">RoyalPay</span>Merchant Supplement

Write Preview
Loading…
Cancel
Save