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

Merge remote-tracking branch 'origin/develop-card-compliance' into develop-card-compliance

Browse Source
master
dulingling 5 years ago
parent b12b62f73e 22e8956d34
commit 64a751190b
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -141,20 +141,20 @@
<if test="card_approving and approving"> <if test="card_approving and approving">
OR (c.client_id NOT IN ( OR (c.client_id NOT IN (
SELECT client_id FROM sys_clients_card_flow SELECT client_id FROM sys_client_upay_profile
) )
OR c.client_id IN ( OR c.client_id IN (
SELECT client_id FROM sys_clients_card_flow AS cardFlow SELECT client_id FROM sys_client_upay_profile AS cardFlow
WHERE cardFlow.approve_result = 4 or approve_result = 1 WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
)) ))
</if> </if>
<if test="card_approving"> <if test="card_approving">
AND (c.client_id NOT IN ( AND (c.client_id NOT IN (
SELECT client_id FROM sys_clients_card_flow SELECT client_id FROM sys_client_upay_profile
) )
OR c.client_id IN ( OR c.client_id IN (
SELECT client_id FROM sys_clients_card_flow AS cardFlow SELECT client_id FROM sys_client_upay_profile AS cardFlow
WHERE cardFlow.approve_result = 4 or approve_result = 1 WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
)) ))
</if> </if>
<if test="quickPass"> <if test="quickPass">

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

@ -180,7 +180,7 @@
<select id="latestCardChannelCleanDays" resultType="com.alibaba.fastjson.JSONObject"> <select id="latestCardChannelCleanDays" resultType="com.alibaba.fastjson.JSONObject">
SELECT cr.*,c.clean_days c_clean_days FROM sys_client_rates cr SELECT cr.*,c.clean_days c_clean_days FROM sys_client_rates cr
INNER JOIN sys_clients c on c.client_id= cr.client_id and c.is_valid = 1 INNER JOIN sys_clients c on c.client_id= cr.client_id and c.is_valid = 1
INNER JOIN sys_clients_card_flow cf ON cf.client_id = c.client_id AND ( cf.approve_result 4 AND cf.open_status NOT IN (0,5) ) INNER JOIN sys_client_upay_profile cf ON cf.client_id = c.client_id AND ( cf.upay_approve_result = 4 AND cf.upay_open_status NOT IN (0,5) )
where cr.client_id = #{client_id} where cr.client_id = #{client_id}
and cr.rate_name = #{rate_name} and cr.rate_name = #{rate_name}
order by cr.expiry_time desc order by cr.expiry_time desc
@ -194,4 +194,4 @@
order by expiry_time desc order by expiry_time desc
limit 1 limit 1
</select> </select>
</mapper> </mapper>

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

@ -690,13 +690,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
var promotiona_date=''; var promotiona_date='';
var promotiona_period =''; var promotiona_period ='';
var contentHtml = $sce.trustAsHtml( var contentHtml = $sce.trustAsHtml(
'<lable>请输入优惠生成日:</lable> '+ '<lable>请输入优惠开始日期(eg:2020-02-01):</lable> '+
'<input id="promotiona_date" ng-bind="promotiona_date"> (eg: 2020-02-01)' + '<input id="promotiona_date" ng-bind="promotiona_date">' +
'<div style="margin-bottom: 5px"></div>' + '<div style="margin-bottom: 5px"></div>' +
'<lable>请输入活动周期数:</lable> ' + '<lable>请输入活动周数(unit:week):</lable> ' +
'<input id="promotiona_period" ng-bind="promotiona_period"> (unit:week)'); '<input id="promotiona_period" ng-bind="promotiona_period">');
var choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true}, var choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true},
{label: '确认提交', className: 'btn-success', key: '1'}]; {label: '确认生成', className: 'btn-success', key: '1'}];
var content = ''; var content = '';
$scope.showCardPromotionaBg = true; $scope.showCardPromotionaBg = true;
commonDialog.confirm({ commonDialog.confirm({

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

@ -487,7 +487,7 @@
<td ng-bind="partner.sub_merchant_id"></td> <td ng-bind="partner.sub_merchant_id"></td>
<td ng-bind="partner.create_time"></td> <td ng-bind="partner.create_time"></td>
<td class="row"> <td class="row">
<div class="col-xs-5" ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}"> <div class="col-xs-4" style="padding-left: 0;padding-right: 0" ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}">
<img height="20px" src="/static/images/royalpay_sign_s.png"> <img height="20px" src="/static/images/royalpay_sign_s.png">
<span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span> <span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span>
<span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span> <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span>
@ -502,10 +502,11 @@
<span ng-if="partner.open_status==10">绿色通道申请中</span> <span ng-if="partner.open_status==10">绿色通道申请中</span>
<span ng-if="partner.approve_result==4 && !partner.open_status"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span> <span ng-if="partner.approve_result==4 && !partner.open_status"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
</div> </div>
<div ng-if="!partner.upay_approve_result" class="col-xs-5">
<div ng-if="!partner.upay_approve_result" class="col-xs-4" style="padding-left: 0;padding-right: 0">
<img height="20px" src="/static/images/card_payment_sign.png"><span> 资料完善中</span> <img height="20px" src="/static/images/card_payment_sign.png"><span> 资料完善中</span>
</div> </div>
<div ng-if="partner.upay_approve_result" class="col-xs-5" style="margin-left: 2px" ng-class="{'bg-green':(partner.upay_approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.upay_open_status==1||partner.upay_open_status==2||partner.upay_open_status==4) && partner.upay_approve_result!=3)||(partner.upay_approve_result==3 && (!partner.upay_open_status || partner.upay_open_status==1 || partner.upay_open_status == 4))||(partner.upay_approve_result==4 && !partner.upay_open_status)}"> <div ng-if="partner.upay_approve_result" style="padding-left: 0;padding-right: 0" class="col-xs-4" style="margin-left: 2px" ng-class="{'bg-green':(partner.upay_approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.upay_open_status==1||partner.upay_open_status==2||partner.upay_open_status==4) && partner.upay_approve_result!=3)||(partner.upay_approve_result==3 && (!partner.upay_open_status || partner.upay_open_status==1 || partner.upay_open_status == 4))||(partner.upay_approve_result==4 && !partner.upay_open_status)}">
<img height="20px" src="/static/images/card_payment_sign.png"> <img height="20px" src="/static/images/card_payment_sign.png">
<span ng-if="partner.upay_approve_result==1 && partner.upay_approve_time">通过({{partner.upay_approve_time}})</span> <span ng-if="partner.upay_approve_result==1 && partner.upay_approve_time">通过({{partner.upay_approve_time}})</span>
<span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source!=4">资料完善中</span> <span ng-if="!partner.upay_open_status && !partner.upay_approve_result && partner.upay_approve_result!=5 && partner.source!=4">资料完善中</span>

Write Preview
Loading…
Cancel
Save