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

fix partners industry改为royalpay行业

Browse Source
master
luoyang 5 years ago
parent 40d044aca9
commit 70252f7f73
13 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

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

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

@ -89,8 +89,9 @@
<if test="business_structure!=null"> <if test="business_structure!=null">
AND c.business_structure=#{business_structure} AND c.business_structure=#{business_structure}
</if> </if>
<if test="industry!=null"> <if test="industry!=null and industry != 0 and industry">
AND c.industry=#{industry} <bind name="industry" value="industry+'%'"/>
AND c.royalpayindustry like #{industry}
</if> </if>
<if test="create_start_time!=null"> <if test="create_start_time!=null">
AND c.create_time >= #{create_start_time} AND c.create_time >= #{create_start_time}

1
src/main/ui/merchant_application.html
Unescape View File

@ -482,6 +482,7 @@ margin-bottom: 10%;"/>
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)" on-select="onAlipayMccSelect($selected)"
placeholder="alipayIndustry" placeholder="alipayIndustry"
chose-one-level="false"
> >
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">

30
src/main/ui/static/commons/directives/multiLevelSelect.js
Unescape View File

@ -10,7 +10,8 @@ define(['../app', 'angular', 'jquery', 'css!../css/multiLevelSelect'], function
multiLevelSelectPopup: '=', multiLevelSelectPopup: '=',
childrenKey: '@', childrenKey: '@',
labelKey: '@', labelKey: '@',
onSelect: '&' onSelect: '&',
choseOneLevel: '='
}, },
link: function (scope, element, attr) { link: function (scope, element, attr) {
var selectBox,bg; var selectBox,bg;
@ -27,8 +28,8 @@ define(['../app', 'angular', 'jquery', 'css!../css/multiLevelSelect'], function
top: (offset.top + $(this).outerHeight() + 3) + 'px', top: (offset.top + $(this).outerHeight() + 3) + 'px',
left: offset.left + 'px' left: offset.left + 'px'
}); });
var container = $('<div></div>').appendTo(selectBox); var container = $('<div style="border: 1px solid #bbb6b5;"></div>').appendTo(selectBox);
initSelectLevel(container, scope.multiLevelSelectPopup, 0); initSelectLevel(container, scope.multiLevelSelectPopup, 0, scope.choseOneLevel);
var $body = $('body'); var $body = $('body');
selectBox.appendTo($body); selectBox.appendTo($body);
bg = $('<div></div>').css({position:'fixed',top:0,left:0,right:0,bottom:0,zIndex:9998}).appendTo($body); bg = $('<div></div>').css({position:'fixed',top:0,left:0,right:0,bottom:0,zIndex:9998}).appendTo($body);
@ -40,8 +41,7 @@ define(['../app', 'angular', 'jquery', 'css!../css/multiLevelSelect'], function
}); });
function initSelectLevel(container, list, groupIndex, choseOneLevel) {
function initSelectLevel(container, list, groupIndex) {
if (selectGroups[groupIndex]) { if (selectGroups[groupIndex]) {
var groups = selectGroups.splice(groupIndex, 999); var groups = selectGroups.splice(groupIndex, 999);
angular.forEach(groups, function (group) { angular.forEach(groups, function (group) {
@ -61,7 +61,8 @@ define(['../app', 'angular', 'jquery', 'css!../css/multiLevelSelect'], function
scope.onSelect({$selected: item}); scope.onSelect({$selected: item});
}) })
}catch(err){} } catch (err) {
}
selectBox.remove(); selectBox.remove();
bg.remove(); bg.remove();
selectBox = null; selectBox = null;
@ -74,10 +75,25 @@ define(['../app', 'angular', 'jquery', 'css!../css/multiLevelSelect'], function
li.addClass('active'); li.addClass('active');
initSelectLevel(container, item.children, groupIndex + 1); initSelectLevel(container, item.children, groupIndex + 1);
}); });
if (choseOneLevel) {
li.click(function () {
if (angular.isFunction(scope.onSelect)) {
try {
scope.$apply(function () {
scope.onSelect({$selected: item});
})
}catch(err){}
selectBox.remove();
bg.remove();
selectBox = null;
}
});
}
} }
}) })
} }
} }
} }
}]) }])
}); });

6
src/main/ui/static/commons/filters/commonFilters.js
Unescape View File

@ -9,6 +9,12 @@ define(['../app', 'jquery'], function (app, $) {
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
royalpay = data; royalpay = data;
var selectAll = {
"label": "All",
"mccCode": "0",
"children":{}
};
royalpay.unshift(selectAll);
} }
}); });

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

@ -224,14 +224,32 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.analysisClients(); $scope.analysisClients();
} }
$scope.pagination = {}; $scope.pagination = {};
$scope.industries = industryMap.configs();
$scope.states = stateMap.configs(); $scope.states = stateMap.configs();
$scope.countries = countryMap.configs(); $scope.countries = countryMap.configs();
$scope.sectors = sectorMap.configs(); $scope.sectors = sectorMap.configs();
$scope.business_structures = businessStructuresMap.configs(); $scope.business_structures = businessStructuresMap.configs();
$scope.clean_days = angular.copy(clean_days_map); $scope.clean_days = angular.copy(clean_days_map);
$scope.bd_citys = angular.copy(bd_city_map); $scope.bd_citys = angular.copy(bd_city_map);
$scope.params = {textType: 'all', org_name: 'ALL'}; $scope.params = {textType: 'all', org_name: 'ALL', industry: "0"};
$scope.loadRoyalpayindustry = function () {
$http.get('/static/data/royalpayindustry.json').then(function (resp) {
$scope.royalpayindustry = resp.data;
var selectAll = {
"label": "All",
"mccCode": "0",
"children":{}
};
$scope.royalpayindustry.unshift(selectAll);
})
};
$scope.loadRoyalpayindustry();
$scope.onRoyalPayIndustrySelect = function (selectedItem) {
$scope.params.royalpay_label = selectedItem.label;
$scope.params.industry = selectedItem.mccCode;
$scope.loadPartners(1);
};
$scope.loadPartners = function (page) { $scope.loadPartners = function (page) {
var params = angular.copy($scope.params); var params = angular.copy($scope.params);

14
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -1197,7 +1197,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipay_category" ng-model="partner.alipay_category"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1291,13 +1292,14 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}"> ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
<label class="control-label col-sm-2" <label class="control-label col-sm-2"
for="royalpayindustry">*RoyalPay Industry</label> for="royalpayindustry">*RoyalPay商户类别</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" id="royalpayindustry" required <input class="form-control" id="royalpayindustry" required
name="royalpayindustry" readonly name="royalpayindustry" readonly
ng-model="partner.royalpayindustry|partner_royalpay_industry" ng-model="partner.royalpayindustry|partner_royalpay_industry"
multi-level-select-popup="royalpayindustry" multi-level-select-popup="royalpayindustry"
on-select="onRoyalPayIndustrySelect($selected)"> on-select="onRoyalPayIndustrySelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.royalpay_label.$error" <div ng-messages="partnerForm.royalpay_label.$error"
ng-if="partnerForm.royalpay_label.$dirty"> ng-if="partnerForm.royalpay_label.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1354,7 +1356,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipayindustry|partner_alipay_industry" ng-model="partner.alipayindustry|partner_alipay_industry"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1372,7 +1375,8 @@
name="hf_label" readonly name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry" ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry" multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"> on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div> </div>
</div> </div>

12
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -1064,7 +1064,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipay_category" ng-model="partner.alipay_category"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1161,7 +1162,8 @@
name="royalpayindustry" readonly name="royalpayindustry" readonly
ng-model="partner.royalpayindustry|partner_royalpay_industry" ng-model="partner.royalpayindustry|partner_royalpay_industry"
multi-level-select-popup="royalpayindustry" multi-level-select-popup="royalpayindustry"
on-select="onRoyalPayIndustrySelect($selected)"> on-select="onRoyalPayIndustrySelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.royalpay_label.$error" <div ng-messages="partnerForm.royalpay_label.$error"
ng-if="partnerForm.royalpay_label.$dirty"> ng-if="partnerForm.royalpay_label.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1219,7 +1221,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipayindustry" ng-model="partner.alipayindustry"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1237,7 +1240,8 @@
name="hf_label" readonly name="hf_label" readonly
ng-model="partner.hfindustry |partner_hf_industry" ng-model="partner.hfindustry |partner_hf_industry"
multi-level-select-popup="hfindustry" multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"> on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group"

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

@ -1026,7 +1026,7 @@
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">RoyalPay Industry</label> <label class="control-label col-sm-2">RoyalPay商户类别</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static industry-p" <p class="form-control-static industry-p"
ng-bind="partner.royalpayindustry|partner_royalpay_industry"></p> ng-bind="partner.royalpayindustry|partner_royalpay_industry"></p>

14
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -1083,7 +1083,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipayindustry|partner_alipay_industry" ng-model="partner.alipayindustry|partner_alipay_industry"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1151,13 +1152,14 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}"> ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
<label class="control-label col-sm-2" <label class="control-label col-sm-2"
for="royalpayindustry"> *RoyalPay Industry</label> for="royalpayindustry"> *RoyalPay商户类别</label>
<div class="col-sm-8" > <div class="col-sm-8" >
<input class="form-control" id="royalpayindustry" required <input class="form-control" id="royalpayindustry" required
name="royalpayindustry" readonly name="royalpayindustry" readonly
ng-model="partner.royalpayindustry|partner_royalpay_industry" ng-model="partner.royalpayindustry|partner_royalpay_industry"
multi-level-select-popup="royalpayindustry" multi-level-select-popup="royalpayindustry"
on-select="onRoyalPayIndustrySelect($selected)"> on-select="onRoyalPayIndustrySelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.royalpay_label.$error" <div ng-messages="partnerForm.royalpay_label.$error"
ng-if="partnerForm.royalpay_label.$dirty"> ng-if="partnerForm.royalpay_label.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1214,7 +1216,8 @@
name="alipay_category" readonly name="alipay_category" readonly
ng-model="partner.alipayindustry|partner_alipay_industry" ng-model="partner.alipayindustry|partner_alipay_industry"
multi-level-select-popup="alipayMccCategory" multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)"> on-select="onAlipayMccSelect($selected)"
chose-one-level="false">
<div ng-messages="partnerForm.alipay_category.$error" <div ng-messages="partnerForm.alipay_category.$error"
ng-if="partnerForm.alipay_category.$dirty"> ng-if="partnerForm.alipay_category.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -1232,7 +1235,8 @@
name="hf_label" readonly name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry" ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry" multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"> on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div> </div>
</div> </div>

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

@ -191,7 +191,8 @@
name="params.org_name" name="params.org_name"
ng-model="params.org_name" ng-model="params.org_name"
multi-level-select-popup="orgs_child" multi-level-select-popup="orgs_child"
on-select="onOrgsSelect($selected)"> on-select="onOrgsSelect($selected)"
chose-one-level="false">
</div> </div>
</div>--> </div>-->
<!-- <div class="form-group col-sm-6" ng-if="orgs"> <!-- <div class="form-group col-sm-6" ng-if="orgs">
@ -229,14 +230,16 @@
</div> </div>
<!--Industry--> <!--Industry-->
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-xs-4 col-sm-4" <label class="control-label col-sm-4"
for="industry-select">Industry</label> for="royalpayindustry">RP商户类别</label>
<div class="col-xs-6"> <div class="col-sm-6">
<select ng-model="params.industry" id="industry-select" <input style="background-color:#fff"
class="form-control" class="form-control" id="royalpayindustry"
ng-options="industry.value as industry.label for industry in industries"> name="royalpayindustry" readonly
<option value="">All</option> ng-value="params.industry|partner_royalpay_industry"
</select> multi-level-select-popup="royalpayindustry"
on-select="onRoyalPayIndustrySelect($selected)"
chose-one-level="true">
</div> </div>
</div> </div>
<!--Clean Days--> <!--Clean Days-->

3
src/main/ui/static/payment/product/templates/add_product.html
Unescape View File

@ -79,7 +79,8 @@
name="hf_industry" readonly name="hf_industry" readonly
ng-model="product.hf_industry|partner_hf_industry" ng-model="product.hf_industry|partner_hf_industry"
multi-level-select-popup="hf_industry" multi-level-select-popup="hf_industry"
on-select="onHfIndustrySelect($selected)"> on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div> </div>
</div> </div>

5
src/main/ui/static/payment/product/templates/product.html
Unescape View File

@ -34,7 +34,8 @@
ng-model="params.hf_industry|partner_hf_industry" ng-model="params.hf_industry|partner_hf_industry"
multi-level-select-popup="hf_industry" multi-level-select-popup="hf_industry"
placeholder="Select a Hf Industry To Follow Up" placeholder="Select a Hf Industry To Follow Up"
on-select="onHfIndustrySelect($selected)"> on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
<a role="button" ng-if="params.hf_industry" style="position: absolute;margin-top: 7px;top: 0;right: 30px;" ng-click="clearHFIndustry()"><i class="fa fa-close"></i></a> <a role="button" ng-if="params.hf_industry" style="position: absolute;margin-top: 7px;top: 0;right: 30px;" ng-click="clearHFIndustry()"><i class="fa fa-close"></i></a>
</div> </div>
</div> </div>
@ -125,4 +126,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save