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

Merge branch 'develop'

Browse Source 
# Conflicts:
#	pom.xml
master
dulingling 5 years ago
parent b262cef7ce dd015ef457
commit 3eb81da29e
7 changed files with 159 additions and 108 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.2.22</version>
<version>2.2.23</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

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

@ -3115,6 +3115,10 @@ public class RetailAppServiceImp implements RetailAppService {
if (cbBankPay.containsKey("channel")) {
channels.add(cbBankPay);
}
JSONObject cardPaymentPay = getChannel(clientId, now, "rpaypmt_card");
if (cardPaymentPay.containsKey("channel")) {
channels.add(cardPaymentPay);
}
res.put("channels", channels);
if (res.containsKey("rate_value")) {
BigDecimal minRate = res.getBigDecimal("rate_value").add(new BigDecimal(0.01)).setScale(2, RoundingMode.DOWN);

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

@ -513,13 +513,24 @@
SELECT
sum(if(((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
c.open_status=1 or c.open_status=2 or c.open_status=4),1,0)) wp,
sum(if(((scup.upay_approve_result=4 and scup.upay_open_status is null) or (scup.upay_approve_result=3 and scup.upay_open_status is null) or
scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4),1,0)) cwp,
sum(if(c.approve_result is null and c.source= 4,1,0)) a_unagree,
sum(if(((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
c.open_status=1 or c.open_status=2 or c.open_status=4) and c.source = 4,1,0)) a_wp,
sum(if(((scup.upay_approve_result=4 and scup.upay_open_status is null) or
scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4) and c.source = 4,1,0)) a_cwp,
sum(if(c.approve_result=2 and c.source = 4,1,0)) wa,
sum(if(c.approve_result=1,1,0)) pass,
sum(if(scup.upay_approve_result=1,1,0)) upass,
sum(if(c.approve_result=1 and c.source=2,1,0)) z_pass,
sum(if(scup.upay_approve_result=1 and c.source=2,1,0)) z_upass,
sum(if(c.approve_result=1 and c.source = 4,1,0)) a_pass,
sum(if(scup.upay_approve_result=1 and c.source = 4,1,0)) a_upass,
sum(if(c.approve_result=0,1,0)) not_pass,
sum(if(c.source=4,1,0)) quick_pass
<if test="tempSubMchId">
@ -527,7 +538,7 @@
</if>
FROM sys_clients c
left join sys_client_config scc on scc.client_id = c.client_id
left join sys_client_upay_profile scup on c.client_id = scup.client_id
where c.is_valid = 1
</select>
<select id="listCityClientIds" resultType="java.lang.String">

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

@ -4167,8 +4167,26 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
if (!$rootScope.complianceCheck) {
$rootScope.complianceCheck = {};
}
$rootScope.complianceCheck.client_id = $scope.partner.client_id;
$rootScope.complianceCheck.authFile = true;
$rootScope.complianceCheck.client_id = $scope.partner.client_id;
if($scope.file.upay_application_form==null || $scope.file.upay_application_form ==''){
commonDialog.alert({type: 'error', title: 'Error', content: '请补充商户申请表合规文件'})
$rootScope.complianceCheck.authFile = false;
}else if($scope.file.client_bank_file==null || $scope.file.client_bank_file ==''){
commonDialog.alert({type: 'error', title: 'Error', content: '请补六个月银行对账单合规文件'})
$rootScope.complianceCheck.authFile = false;
}else if($scope.file.client_company_file==null || $scope.file.client_company_file ==''){
commonDialog.alert({type: 'error', title: 'Error', content: '请补充当前公司信息摘录合规文件'})
$rootScope.complianceCheck.authFile = false;
}else if($scope.file.upay_driver_license==null || $scope.file.upay_driver_license ==''){
commonDialog.alert({type: 'error', title: 'Error', content: '请补充法人身份证明合规文件'})
$rootScope.complianceCheck.authFile = false;
} else if($scope.file.kyc_utility_bill_file==null || $scope.file.kyc_utility_bill_file ==''){
commonDialog.alert({type: 'error', title: 'Error', content: '请补充家庭住址证明 （一个水电煤网账单）合规文件'})
$rootScope.complianceCheck.authFile = false;
}
};
$scope.complianceChangeCheck = function () {
if ($rootScope.complianceCheck) {

198
src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
Unescape View File

@ -11,103 +11,6 @@
</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="panel panel-info">
<div class="panel-heading"><h4>
ID描述信息
<a class="small" role="button" ng-if="!id_info_form.edit" ng-click="id_info_form.edit=true">
<i class="fa fa-edit"></i></a>
</h4></div>
<div class="panel-body">
<div class="row form-horizontal">
<div class="form-group" ng-if="id_info_form.edit">
<label class="control-label col-sm-2">* Choose ID Type </label>
<div class="col-sm-4">
<div class="form-control-static">
<select class="form-control"
ng-model="file.id_type" style="width: 250px" ng-change="setIDTypeSession(file.id_type)">
<option value="">Please Choose</option>
<option value="passport" >Passport</option>
<option value="driver_license">Driver license</option>
</select>
</div>
</div>
</div>
<div class="form-group" ng-if="id_info_form.edit">
<label class="control-label col-sm-2">* ID Title</label>
<div class="col-sm-6">
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Ultimate beneficiary owner'}"
ng-click="toggleIdTitle('Ultimate beneficiary owner')">
Ultimate beneficiary owner</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='CEO'}"
ng-click="toggleIdTitle('CEO')">
CEO</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Director'}"
ng-click="toggleIdTitle('Director')">
Director</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='General Manager'}"
ng-click="toggleIdTitle('General Manager')">
General Manager</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Other'}"
ng-click="toggleIdTitle('Other')">
Other</button>
</div>
</div>
<div class="form-group" ng-if="id_info_form.edit && file.beneficiary_id_title!='Ultimate beneficiary owner'">
<label class="control-label col-sm-2">* 请简要告知为何无法提供受益股东的资料</label>
<div class="col-sm-4">
<div class="form-control-static">
<textarea class="form-control" ng-model="file.other_id_title_desc" style="height: 100px"></textarea>
</div>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit">
<label class="control-label col-sm-2">ID Type </label>
<div class="col-sm-4">
<div class="form-control-static">
<span>{{file.id_type}}</span>
</div>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit">
<label class="control-label col-sm-2">ID Title</label>
<div class="col-sm-6">
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Ultimate beneficiary owner'}">
Ultimate beneficiary owner</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='CEO'}">
CEO</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Director'}">
Director</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='General Manager'}">
General Manager</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Other'}">
Other</button>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit && file.beneficiary_id_title!='Ultimate beneficiary owner'">
<label class="control-label col-sm-2">请简要告知为何无法提供受益股东的资料</label>
<div class="col-sm-4">
<div class="form-control-static">
<textarea class="form-control" ng-model="file.other_id_title_desc" style="height: 100px" disabled></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="panel-footer" ng-if="id_info_form.edit">
<button class="btn btn-success" ng-click="saveIdInfo()">保存</button>
<button class="btn btn-danger" ng-click="cancelIdInfo()">取消</button>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">* bank statement</label>
<div class="col-sm-4">
@ -136,8 +39,6 @@
</tr>
</tbody>
</table>
</div>
<div class="col-sm-6">
<div class="form-control-static">
@ -198,6 +99,7 @@
ngf-select="uploadIDFile($file)">
<i class="fa fa-upload"></i> Upload
</button>
<button class="btn btn-primary" ng-if="!id_info_form.edit" ng-click="id_info_form.edit=true">补充ID描述信息</button>
<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>
@ -233,6 +135,102 @@
</div>
</div>
<div class="panel panel-info" style="margin-left: 300px" ng-if="id_info_form.edit">
<div class="panel-heading"><h4>
ID描述信息
</h4></div>
<div class="panel-body">
<div class="row form-horizontal">
<div class="form-group" ng-if="id_info_form.edit">
<label class="control-label col-sm-2">* Choose ID Type </label>
<div class="col-sm-4">
<div class="form-control-static">
<select class="form-control"
ng-model="file.id_type" style="width: 250px" ng-change="setIDTypeSession(file.id_type)">
<option value="">Please Choose</option>
<option value="passport" >Passport</option>
<option value="driver_license">Driver license</option>
</select>
</div>
</div>
</div>
<div class="form-group" ng-if="id_info_form.edit">
<label class="control-label col-sm-2">* ID Title</label>
<div class="col-sm-6">
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Ultimate beneficiary owner'}"
ng-click="toggleIdTitle('Ultimate beneficiary owner')">
Ultimate beneficiary owner</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='CEO'}"
ng-click="toggleIdTitle('CEO')">
CEO</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Director'}"
ng-click="toggleIdTitle('Director')">
Director</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='General Manager'}"
ng-click="toggleIdTitle('General Manager')">
General Manager</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Other'}"
ng-click="toggleIdTitle('Other')">
Other</button>
</div>
</div>
<div class="form-group" ng-if="id_info_form.edit && file.beneficiary_id_title!='Ultimate beneficiary owner'">
<label class="control-label col-sm-2">* 请简要告知为何无法提供受益股东的资料</label>
<div class="col-sm-4">
<div class="form-control-static">
<textarea class="form-control" ng-model="file.other_id_title_desc" style="height: 100px"></textarea>
</div>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit">
<label class="control-label col-sm-2">ID Type </label>
<div class="col-sm-4">
<div class="form-control-static">
<span>{{file.id_type}}</span>
</div>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit">
<label class="control-label col-sm-2">ID Title</label>
<div class="col-sm-6">
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Ultimate beneficiary owner'}">
Ultimate beneficiary owner</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='CEO'}">
CEO</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Director'}">
Director</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='General Manager'}">
General Manager</button>
<button class="btn btn-default"
ng-class="{active:file.beneficiary_id_title=='Other'}">
Other</button>
</div>
</div>
<div class="form-group" ng-if="!id_info_form.edit && file.beneficiary_id_title!='Ultimate beneficiary owner'">
<label class="control-label col-sm-2">请简要告知为何无法提供受益股东的资料</label>
<div class="col-sm-4">
<div class="form-control-static">
<textarea class="form-control" ng-model="file.other_id_title_desc" style="height: 100px" disabled></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="panel-footer" ng-if="id_info_form.edit">
<button class="btn btn-success" ng-click="saveIdInfo()">保存</button>
<button class="btn btn-danger" ng-click="cancelIdInfo()">取消</button>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">* Agreement</label>
@ -356,6 +354,8 @@
</div>
</div>
</div>
</div>
</div>
<div style="text-align: center">

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

@ -289,6 +289,12 @@
<a ng-if="partner.upay_open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="cardNotifyBD()">
<i class="fa fa-thumb-tack"></i> Notify BD</a>
<div ng-if="!partner.upay_open_status" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-primary" ng-click="apply2makeCardAgreeFile()">
<i class="fa fa-paper-plane"></i>
提交合规制作卡支付合同
</button>
</div>
</span>
<div ng-if="partner.audit_card_logs">
<hr>
@ -346,8 +352,7 @@
type="button" ng-href="{{promotionalOfferFileManager.promotional_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Promotional Offer合同</a>
<div ng-if="partner.upay_open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCardCompliance()">Commit to Compliance
</button>
<button type="button" class="btn btn-danger" ng-click="commitToCardCompliance()">Commit to Compliance</button>
</div>
<!--<div>
<a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_open_status==3" role="button" class="btn-group btn btn-success"

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

@ -5,6 +5,11 @@
.del_client{
text-decoration: line-through;
}
.big-number-type{
font-weight: bold;
font-size: 18px;
}
</style>
<div ui-view>
<section class="content-header">
@ -24,8 +29,10 @@
<span class="info-box-icon bg-aqua"><i class="ion ion-ios-people"></i></span>
<div class="info-box-content">
<span class="info-box-text">Waiting Compliance</span>
<a role="button" ng-click="params.approving=true;loadPartners(1)"><span class="info-box-number">{{analysis.wp}}</span></a>
<small>其中自助开通:{{analysis.a_wp}}</small>
<a role="button" ng-click="params.approving=true;loadPartners(1)"><img height="20px" src="/static/images/royalpay_sign_s.png"><span class="big-number-type"> {{analysis.wp}}</span></a>&nbsp;|&nbsp;
<a role="button" ng-click="params.approving=true;loadPartners(1)"><img height="20px" src="/static/images/card_payment_sign.png"><span class="big-number-type"> {{analysis.cwp}}</span></a>
<br/>
<small>其中自助开通:<img height="20px" src="/static/images/royalpay_sign_s.png"> {{analysis.a_wp}} | <img height="20px" src="/static/images/card_payment_sign.png"> {{analysis.a_wp}}</small>
</div>
</div>
</div>
@ -34,8 +41,14 @@
<span class="info-box-icon bg-green"><i class="ion ion-ios-people"></i></span>
<div class="info-box-content">
<span class="info-box-text">Pass</span>
<span class="info-box-number">{{analysis.pass}}</span>
<small>其中自助开通:{{analysis.z_pass+analysis.a_pass}}</small>
<span class="info-box-number">
<img height="20px" src="/static/images/royalpay_sign_s.png"> {{analysis.pass}}&nbsp;|&nbsp;
<img height="20px" src="/static/images/card_payment_sign.png"> {{analysis.upass}}
</span>
<small>其中自助开通:
<img height="20px" src="/static/images/royalpay_sign_s.png"> {{analysis.z_pass+analysis.a_pass}}&nbsp;|&nbsp;
<img height="20px" src="/static/images/card_payment_sign.png"> {{analysis.z_upass+analysis.a_upass}}
</small>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save