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

增加hfindustry

Browse Source
master
yuan 6 years ago
parent 20360ade11
commit e598d77925
10 changed files with 506 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/db/modify.sql
Unescape View File

@ -603,3 +603,5 @@ CREATE TABLE `pre_apply_handle_log` (
ALTER TABLE `sys_client_pre_apply`
ADD COLUMN `status` tinyint(2) NULL DEFAULT 0 COMMENT '0:未处理，1：处理中，2：处理完成';
alter table sys_clients add column hfindustry varchar(10) DEFAULT NULL COMMENT 'HF行业';

9
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -63,6 +63,7 @@ public class ClientRegisterInfo {
private String timezone;
private String jdindustry;
private String royalpayindustry;
private String hfindustry;
private String referrer_id;
private String referrer_name;
@ -367,4 +368,12 @@ public class ClientRegisterInfo {
public void setMerchant_video_url(String merchant_video_url) {
this.merchant_video_url = merchant_video_url;
}
public String getHfindustry() {
return hfindustry;
}
public void setHfindustry(String hfindustry) {
this.hfindustry = hfindustry;
}
}

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

@ -34,6 +34,17 @@ define(['../app', 'jquery'], function (app, $) {
}
});
var hfindustry = [];
$.ajax({
url: '/static/data/hfindustry.json',
method: 'GET',
async: false,
dataType: 'json',
success: function (data) {
hfindustry = data;
}
});
app.filter('partner_state', ['stateMap', function (stateMap) {
return function (stateValue) {
@ -106,6 +117,29 @@ define(['../app', 'jquery'], function (app, $) {
}
}]);
app.filter('partner_hf_industry', ['$http', function ($http) {
return function (industryCode) {
var industryLabel = '';
angular.forEach(hfindustry, function (category) {
if (category.mccCode == industryCode) {
industryLabel = category.label;
}
angular.forEach(category.children, function (categoryChildren1) {
if (categoryChildren1.mccCode == industryCode) {
industryLabel = categoryChildren1.label;
}
angular.forEach(categoryChildren1.children, function (categoryChildren2) {
if (categoryChildren2.mccCode == industryCode) {
industryLabel = categoryChildren2.label;
}
});
});
});
return industryLabel;
}
}]);
app.filter('partner_royalpay_industry', ['$http', function ($http) {
return function (industryCode) {
var industryLabel = '';

348
src/main/ui/static/data/hfindustry.json
Unescape View File

@ -0,0 +1,348 @@
[
{
"children": [
{
"children": [],
"label": "护肤品",
"mccCode": "100003"
},
{
"children": [],
"label": "洗发护发",
"mccCode": "100004"
},
{
"children": [],
"label": "身体护理",
"mccCode": "100005"
},
{
"children": [],
"label": "口腔护理",
"mccCode": "100006"
},
{
"children": [],
"label": "包包",
"mccCode": "100007"
},
{
"children": [],
"label": "女装",
"mccCode": "100008"
},
{
"children": [],
"label": "男装",
"mccCode": "100009"
},
{
"children": [],
"label": "童装",
"mccCode": "100010"
},
{
"children": [],
"label": "内衣",
"mccCode": "100011"
},
{
"children": [],
"label": "睡衣",
"mccCode": "100012"
},
{
"children": [],
"label": "袜品",
"mccCode": "100013"
},
{
"children": [],
"label": "配饰",
"mccCode": "100014"
} ,
{
"children": [],
"label": "香水",
"mccCode": "100015"
} ,
{
"children": [],
"label": "彩妆",
"mccCode": "100016"
} ,
{
"children": [],
"label": "奶粉",
"mccCode": "100017"
} ,
{
"children": [],
"label": "母婴营养保健",
"mccCode": "100018"
} ,
{
"children": [],
"label": "婴儿辅食",
"mccCode": "100019"
} ,
{
"children": [],
"label": "尿裤纸巾",
"mccCode": "100020"
} ,
{
"children": [],
"label": "男鞋",
"mccCode": "100021"
} ,
{
"children": [],
"label": "女鞋",
"mccCode": "100022"
} ,
{
"children": [],
"label": "运动鞋",
"mccCode": "100023"
} ,
{
"children": [],
"label": "户外鞋",
"mccCode": "100024"
} ,
{
"children": [],
"label": "运动服",
"mccCode": "100025"
} ,
{
"children": [],
"label": "休闲服装",
"mccCode": "100026"
} ,
{
"children": [],
"label": "家纺/床品",
"mccCode": "100027"
} ,
{
"children": [],
"label": "生活日用",
"mccCode": "100028"
} ,
{
"children": [],
"label": "厨房电器",
"mccCode": "100029"
} ,
{
"children": [],
"label": "家装软饰",
"mccCode": "100030"
} ,
{
"children": [],
"label": "生活电器",
"mccCode": "100031"
} ,
{
"children": [],
"label": "手机",
"mccCode": "100032"
} ,
{
"children": [],
"label": "手机配件",
"mccCode": "100033"
} ,
{
"children": [],
"label": "数码相机",
"mccCode": "100034"
} ,
{
"children": [],
"label": "单反相机",
"mccCode": "100035"
} ,
{
"children": [],
"label": "摄像机",
"mccCode": "100036"
} ,
{
"children": [],
"label": "镜头",
"mccCode": "100037"
} ,
{
"children": [],
"label": "耳机/耳麦",
"mccCode": "100038"
} ,
{
"children": [],
"label": "音箱/音响",
"mccCode": "100039"
} ,
{
"children": [],
"label": "数码配件",
"mccCode": "100040"
} ,
{
"children": [],
"label": "智能手环",
"mccCode": "100041"
} ,
{
"children": [],
"label": "影音娱乐",
"mccCode": "100042"
} ,
{
"children": [],
"label": "笔记本",
"mccCode": "100043"
} ,
{
"children": [],
"label": "进口食品",
"mccCode": "100044"
} ,
{
"children": [],
"label": "休闲食品",
"mccCode": "100045"
} ,
{
"children": [],
"label": "营养品",
"mccCode": "100046"
} ,
{
"children": [],
"label": "地方特产",
"mccCode": "100047"
}
],
"label": "实物类-网络购物",
"mccCode": "122030"
},
{
"children": [
{
"children": [],
"label": "游戏点卡",
"mccCode": "200003"
},
{
"children": [],
"label": "游戏周边",
"mccCode": "200004"
},
{
"children": [],
"label": "网页游戏",
"mccCode": "200005"
},
{
"children": [],
"label": "手机游戏",
"mccCode": "200006"
},
{
"children": [],
"label": "电脑杀毒软件",
"mccCode": "200007"
},
{
"children": [],
"label": "电脑安装软件",
"mccCode": "200008"
},
{
"children": [],
"label": "虚拟服务租赁",
"mccCode": "200009"
},
{
"children": [],
"label": "物理服务器租赁",
"mccCode": "200010"
},
{
"children": [],
"label": "国际线路租赁",
"mccCode": "200011"
},
{
"children": [],
"label": "域名",
"mccCode": "200012"
},
{
"children": [],
"label": "网页设计",
"mccCode": "200013"
},
{
"children": [],
"label": "软件设计",
"mccCode": "200014"
}
],
"label": "虚拟物品类-计算机服务",
"mccCode": "227020"
},
{
"children": [
{
"children": [],
"label": "留学学费",
"mccCode": "300003"
}
],
"label": "教育类-留学及教育相关旅行（一年以上）",
"mccCode": "223022"
},
{
"children": [
{
"children": [],
"label": "出国夏令营费用",
"mccCode": "300004"
}
],
"label": "教育类-留学及教育相关旅行(一年及一年以下)",
"mccCode": "223023"
},
{
"children": [
{
"children": [],
"label": "机票",
"mccCode": "400003"
}
],
"label": "旅游类-空运客运",
"mccCode": "222024"
},
{
"children": [
{
"children": [],
"label": "酒店",
"mccCode": "400004"
},
{
"children": [],
"label": "当地旅游费用",
"mccCode": "400005"
}
],
"label": "旅游类-其他私人旅行",
"mccCode": "223029"
}
]

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

@ -321,6 +321,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$scope.loadRoyalpayindustry();
$scope.loadHfindustry = function () {
$http.get('/static/data/hfindustry.json').then(function (resp) {
$scope.hfindustry = resp.data;
})
};
$scope.loadHfindustry();
$scope.onAlipayMccSelect = function (selectedItem) {
$scope.partner.alipay_category = selectedItem.label;
$scope.partner.alipayindustry = selectedItem.mccCode;
@ -331,6 +338,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.royalpayindustry = selectedItem.mccCode;
};
$scope.onHfIndustrySelect = function (selectedItem) {
$scope.partner.hf_label = selectedItem.label;
$scope.partner.hfindustry = selectedItem.mccCode;
};
// $scope.t2city_map = angular.copy(t2city_map);
$scope.timezones = timezone.configs();
@ -506,6 +518,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$scope.showFile();
$scope.passClient = function () {
if ($scope.partner.enable_hf) {
if($scope.partner.hfindustry == null){
alert("已开启HF支付通道，HF行业不可为空!");
return;
}
}
if (!$rootScope.complianceCheck) {
alert("please check first");
return;
@ -522,7 +540,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert("Bank Account not checked");
return;
}
commonDialog.confirm({
/* commonDialog.confirm({
title: 'Audit Partner',
content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？'
}).then(function () {
@ -545,7 +563,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
});
});*/
};
$scope.pass2GreenChannel = function () {
commonDialog.confirm({
@ -915,6 +933,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$scope.loadRoyalpayindustry();
$scope.loadHfindustry = function () {
$http.get('/static/data/hfindustry.json').then(function (resp) {
$scope.hfindustry = resp.data;
})
};
$scope.loadHfindustry();
$scope.onAlipayMccSelect = function (selectedItem) {
$scope.partner.alipay_category = selectedItem.label;
$scope.partner.alipayindustry = selectedItem.mccCode;
@ -923,6 +948,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.royalpay_label = selectedItem.label;
$scope.partner.royalpayindustry = selectedItem.mccCode;
};
$scope.onHfIndustrySelect = function (selectedItem) {
$scope.partner.hf_label = selectedItem.label;
$scope.partner.hfindustry = selectedItem.mccCode;
};
$scope.updatePartner = function (form) {
@ -1852,6 +1881,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$scope.loadRoyalpayindustry();
$scope.loadHfindustry = function () {
$http.get('/static/data/hfindustry.json').then(function (resp) {
$scope.hfindustry = resp.data;
})
};
$scope.loadHfindustry();
$scope.onAlipayMccSelect = function (selectedItem) {
$scope.partner.alipay_category = selectedItem.label;
@ -1862,6 +1898,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.royalpayindustry = selectedItem.mccCode;
};
$scope.onHfIndustrySelect = function (selectedItem) {
$scope.partner.hf_label = selectedItem.label;
$scope.partner.hfindustry = selectedItem.mccCode;
};
// $scope.t2city_map = angular.copy(t2city_map);
$scope.timezones = timezone.configs();

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

@ -819,9 +819,9 @@
</div>
</div>
<div class="form-group col-sm-6"
<div class="form-group"
ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
<label class="control-label col-sm-4"
<label class="control-label col-sm-2"
for="alipay_category">*Alipay Category</label>
<div class="col-sm-8" >
<input class="form-control" id="alipay_category" required
@ -838,7 +838,17 @@
</div>
<div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8" >
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)">
</div>
</div>
</div>
</div>
</div>

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

@ -698,14 +698,14 @@
</div>
</div>
<div class="form-group col-sm-6"
<div class="form-group"
ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
<label class="control-label col-sm-4"
<label class="control-label col-sm-2"
for="alipay_category">*Alipay Category</label>
<div class="col-sm-8" >
<input class="form-control" id="alipay_category" required
name="alipay_category" readonly
ng-model="partner.alipayindustry|partner_alipay_industry"
ng-model="partner.alipayindustry"
multi-level-select-popup="alipayMccCategory"
on-select="onAlipayMccSelect($selected)">
<div ng-messages="partnerForm.alipay_category.$error"
@ -717,7 +717,17 @@
</div>
<div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8" >
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry |partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)">
</div>
</div>
</div>
</div>

15
src/main/ui/static/payment/partner/templates/client_payment_info.html
Unescape View File

@ -75,6 +75,21 @@
</div>
</div>
<div class="panel panel-default" ng-if="partner.enable_hf&&partner.hf_pay_url">
<div class="panel-heading">HF Pay Link
</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">HF Pay Link</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.hf_pay_url"></p>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">Paying Surcharge
</div>

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

@ -706,6 +706,7 @@
</div>
<div class="form-group">
<label class="control-label col-sm-2">Alipay Category</label>
<div class="col-sm-10">
@ -717,9 +718,19 @@
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
</div>
<div class="form-group" ng-if="partner.hfindustry&&(('10'|withRole) || ('1'|withRole))">
<label class="control-label col-sm-2">HF Industry</label>
<div class="col-sm-10">
<p class="form-control-static industry-p"ng-if="partner.hfindustry">
{{partner.hfindustry| partner_hf_industry}}
&nbsp;&nbsp;&nbsp;({{partner.hfindustry}})
</p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
</div>
</div>
</div>

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

@ -608,9 +608,9 @@
</div>
</div>
<div class="form-group col-sm-6"
<div class="form-group"
ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
<label class="control-label col-sm-4"
<label class="control-label col-sm-2"
for="alipay_category">*Alipay Category</label>
<div class="col-sm-8" >
<input class="form-control" id="alipay_category" required
@ -627,7 +627,17 @@
</div>
<div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8" >
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)">
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save