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

fix 报表优化

Browse Source
master
luoyang 6 years ago
parent 68f0586c4a
commit 3179124d00
5 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -113,13 +113,19 @@
locate(c.client_moniker,#{temp_mch_id_source})<=0 locate(c.client_moniker,#{temp_mch_id_source})<=0
</if> </if>
<if test="approving">
and ((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)
</if>
<if test="quickPass">
and c.source=4
</if>
<if test="greenChannelBdTodo"> <if test="greenChannelBdTodo">
and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3)) and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3))
</if> </if>
<if test="search_text!=null"> <if test="search_text!=null">
<bind name="name_pattern" value="'%'+search_text+'%'"/> <bind name="name_pattern" value="'%'+search_text+'%'"/>
<if test="text_type=='all'"> <if test="text_type=='all'">

7
src/main/ui/static/analysis/templates/trans_analysis.html
Unescape View File

@ -193,7 +193,7 @@
</div> </div>
<div class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6">
<div class="description-block"> <div class="description-block">
<div class="description-header text-bold"><img src="/static/images/alipay_sign.png"/>AlipayOnline</div> <div class="description-header text-bold"><small><img src="/static/images/alipay_sign.png"/>AlipayOnline</small></div>
<div class="description-text"> <div class="description-text">
<label class="description-text text-red" <label class="description-text text-red"
ng-bind="totalChannelAmount.alipayonlineamount|currency: ' $ '"></label></br> ng-bind="totalChannelAmount.alipayonlineamount|currency: ' $ '"></label></br>
@ -226,7 +226,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<!-- 显示Rpay+交易额分析--> <!-- 显示Rpay+交易额分析-->
<div class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6">
<div class="description-block"> <div class="description-block">
@ -252,7 +254,7 @@
</div> </div>
<div class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6">
<div class="description-block"> <div class="description-block">
<div class="description-header text-bold"><img src="/static/images/lakalapay_sign.png"/>LakalaPay</div> <div class="description-header text-bold"><small><img src="/static/images/lakalapay_sign.png"/>LakalaPay</small></div>
<div class="description-text"> <div class="description-text">
<label class="description-text text-red" <label class="description-text text-red"
ng-bind="totalChannelAmount.lakalapayamount|currency: ' $ '"></label></br> ng-bind="totalChannelAmount.lakalapayamount|currency: ' $ '"></label></br>
@ -261,7 +263,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--<table class="table"> <!--<table class="table">
<tr> <tr>

8
src/main/ui/static/merchantapplication/merchant_application.js
Unescape View File

@ -241,6 +241,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
return; return;
} }
$scope.initParam(); $scope.initParam();
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
}
$scope.partner.username = $scope.partner.contact_phone; $scope.partner.username = $scope.partner.contact_phone;
$scope.partner.apply_source = 'pc'; $scope.partner.apply_source = 'pc';
$http.post('/register/info/update/' + $scope.partner.username +'/step1', $scope.partner).then(function (resp) { $http.post('/register/info/update/' + $scope.partner.username +'/step1', $scope.partner).then(function (resp) {
@ -265,6 +269,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
$scope.submit = true; $scope.submit = true;
} }
$scope.initParam(); $scope.initParam();
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
}
$http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) { $http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) {
if (index == 3) { if (index == 3) {
$scope.getRateConfig(); $scope.getRateConfig();

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

@ -700,7 +700,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.showFile(); $scope.showFile();
$scope.passClient = function () { $scope.passClient = function () {
if (!$scope.partner.wechat_institution_merchant_id) { if (!$scope.partner.wechat_institution_merchant_id) {
commonDialog.alert({title: 'info', content: 'HF Institution Merchant Id not Refresh', type: 'info'}); commonDialog.alert({title: 'info', content: 'Wechat Institution Merchant Id not Refresh', type: 'info'});
return; return;
} }
if ($scope.partner.enable_hf) { if ($scope.partner.enable_hf) {

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

@ -357,11 +357,9 @@
</div> </div>
</div> </div>
</div> </div>
<!--status--> <div class="form-group col-sm-12">
<!--商户合规位置转移到合规模块的商户合规模块下-->
<!--<div class="form-group col-sm-12" ng-if="'10'|withRole">
<label class="control-label col-xs-4 col-sm-2">Status</label> <label class="control-label col-xs-4 col-sm-2">Status</label>
&lt;!&ndash;<div class="col-xs-8 col-sm-4">&ndash;&gt; <!--<div class="col-xs-8 col-sm-4">-->
<span class="col-xs-8 col-sm-10"> <span class="col-xs-8 col-sm-10">
<span class="checkbox-inline"> <span class="checkbox-inline">
<label> <label>
@ -380,36 +378,9 @@
<input type="checkbox" ng-model="params.quickPass"> 自助开通 <input type="checkbox" ng-model="params.quickPass"> 自助开通
</label> </label>
</span> </span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-model="params.greenChannel"> 绿色通道
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-model="params.pass"> 通过
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-model="params.completed_contract"> 资料完善中
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-model="params.apply_to_back"> 申请打回
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-model="params.bd_upload_material"> 等待BD上传材料审核
</label>
</span>
</span> </span>
&lt;!&ndash;</div>&ndash;&gt; <!--</div>-->
</div>--> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button"
ng-click="loadPartners(1)"><i ng-click="loadPartners(1)"><i

Write Preview
Loading…
Cancel
Save