diff --git a/pom.xml b/pom.xml
index cc021aba4..97425ae42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 2.3.74-SNAPSHOT
+ 2.3.74
UTF-8
2.4.0
diff --git a/src/db/modify.sql b/src/db/modify.sql
index 2053b4215..52d9dbccf 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -771,3 +771,8 @@ alter table sys_wx_merchant_apply
ALTER TABLE `sys_clients`
ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间';
+
+
+-- 商户表 日期类型改为varchar 2020.12.23
+ALTER TABLE `sys_clients`
+ modify COLUMN certificat_expire_date varchar(20) DEFAULT NULL COMMENT '注册证书过期时间';
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index e5cea877e..a2db2971f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -134,7 +134,7 @@ public class ClientRegisterInfo {
private String director_id_number;
private String principal_name;
private String principal_id_number;
- private Date certificat_expire_date;//注册证书过期时间
+ private String certificat_expire_date;//注册证书过期时间
private String mc_code;//微信mccode
@@ -675,11 +675,11 @@ public class ClientRegisterInfo {
this.principal_id_number = principal_id_number;
}
- public Date getCertificat_expire_date() {
+ public String getCertificat_expire_date() {
return certificat_expire_date;
}
- public void setCertificat_expire_date(Date certificat_expire_date) {
+ public void setCertificat_expire_date(String certificat_expire_date) {
this.certificat_expire_date = certificat_expire_date;
}
diff --git a/src/main/ui/static/commons/services/industryMap.js b/src/main/ui/static/commons/services/industryMap.js
index 75aad7d3c..56c927b9c 100644
--- a/src/main/ui/static/commons/services/industryMap.js
+++ b/src/main/ui/static/commons/services/industryMap.js
@@ -158,6 +158,126 @@ define(['../app'], function (app) {
{
"label": "Medical Service",
"value": "533"
+ },
+ {
+ "label": "Online games (Top-up)",
+ "value": "644"
+ },
+ {
+ "label": "Online Shopping Mall",
+ "value": "648"
+ },
+ {
+ "label": "Supermarket",
+ "value": "649"
+ },
+ {
+ "label": "Convenience Store",
+ "value": "651"
+ },
+ {
+ "label": "Duty-free Shop",
+ "value": "652"
+ },
+ {
+ "label": "Pharmacy",
+ "value": "653"
+ },
+ {
+ "label": "Vending Machine",
+ "value": "654"
+ },
+ {
+ "label": "Department Store /Shopping Centre",
+ "value": "655"
+ },
+ {
+ "label": "Food/Beverages",
+ "value": "656"
+ },
+ {
+ "label": "Catering Services",
+ "value": "657"
+ },
+ {
+ "label": "Furniture/Household Products",
+ "value": "658"
+ },
+ {
+ "label": "Home Appliances/Camera Equipment/Office Equipment",
+ "value": "659"
+ },
+ {
+ "label": "Beauty/Personal Care Products",
+ "value": "660"
+ },
+ {
+ "label": "Flowers/Plants/Interior Decorations/Decorations",
+ "value": "661"
+ },
+ {
+ "label": "Nursery Products/Toys",
+ "value": "662"
+ },
+ {
+ "label": "Clothing/Shoes/Other Accessories",
+ "value": "663"
+ },
+ {
+ "label": "Sports/Fitness Equipment/Security",
+ "value": "664"
+ },
+ {
+ "label": "Watches/Eyewear/Jewellery",
+ "value": "665"
+ },
+ {
+ "label": "Outdoor Products /Travel Products",
+ "value": "666"
+ },
+ {
+ "label": "Books / Records / Stationery / Musical Instruments",
+ "value": "667"
+ },
+ {
+ "label": "Flight ticket/ticketing agent",
+ "value": "668"
+ },
+ {
+ "label": "Sightseeing Passes",
+ "value": "669"
+ },
+ {
+ "label": "Hotel/Resort",
+ "value": "670"
+ },
+ {
+ "label": "Online Books/Video/Music",
+ "value": "671"
+ },
+ {
+ "label": "Online games (Download)",
+ "value": "672"
+ },
+ {
+ "label": "University Education",
+ "value": "677"
+ },
+ {
+ "label": "Public hospitals/Medical Institutions",
+ "value": "679"
+ },
+ {
+ "label": "Private hospitals/Clinics/Medical institutions",
+ "value": "678"
+ },
+ {
+ "label": "Public transit",
+ "value": "680"
+ },
+ {
+ "label": "Logistics/ Courier Service",
+ "value": "684"
}
];
app.factory('industryMap', function () {
diff --git a/src/main/ui/static/payment/partner/add-partner.js b/src/main/ui/static/payment/partner/add-partner.js
index b8ead9fef..3b28d185f 100644
--- a/src/main/ui/static/payment/partner/add-partner.js
+++ b/src/main/ui/static/payment/partner/add-partner.js
@@ -32,7 +32,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}]);
- app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc) {
+ app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc','$filter', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc,$filter) {
if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application;
@@ -57,7 +57,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.contact_phone_c = 61;
$scope.partner.client_pay_type = [];
$scope.partner.client_pay_desc = [];
-
+ $scope.checkExpriedate=function (value) {
+ if(value){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_NA=false;
+ }
+ }
+ $scope.checkExpriedateOther=function (value) {
+ if(value=='PERMANENT'){
+ if($scope.partner.certificat_expire_date_premanent){
+ $scope.partner.certificat_expire_date_NA=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }else if(value=='N/A'){
+ if($scope.partner.certificat_expire_date_NA){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }
+ }
var resetClientPayDescByTpey = function (type) {
type = parseInt(type);
if (type == 1) {
@@ -232,6 +250,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Please select the business structure');
return;
}
+ if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
+ if ($scope.partner.certificat_expire_date_d) {
+ $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
+ } else if ($scope.partner.certificat_expire_date_premanent) {
+ $scope.partner.certificat_expire_date = "PERMANENT";
+ }
+ else if ($scope.partner.certificat_expire_date_NA) {
+ $scope.partner.certificat_expire_date = "N/A";
+ } else {
+ alert("Certificate expiration time is required");
+ return;
+ }
+ }
if (!$scope.partner.enable_cross_payment && !$scope.partner.enable_card_payment) {
alert("商户至少开通一种支付方式，请检查是否选择了跨境支付或卡支付！");
return;
@@ -441,16 +472,45 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}
}]);
- app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc',
- function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc) {
+ app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc','$filter',
+ function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc,$filter) {
$scope.upayIndustrys = upayIndustryMap.configs();
$scope.timezones = timezone.configs();
$scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.partner = partner.data;
+ // if(partner.data.certificat_expire_date) {
+ // var datestr = partner.data.certificat_expire_date.replace(/-/g, '/');
+ // $scope.partner.certificat_expire_date=new Date(datestr);
+ // }
if(partner.data.certificat_expire_date) {
- var datestr = partner.data.certificat_expire_date.replace(/-/g, '/');
- $scope.partner.certificat_expire_date=new Date(datestr);
+ if( $scope.partner.certificat_expire_date=="PERMANENT"){
+ $scope.partner.certificat_expire_date_premanent=true;
+ }else if( $scope.partner.certificat_expire_date=="N/A"){
+ $scope.partner.certificat_expire_date_NA=true;
+ }else {
+ var datestr = $scope.partner.certificat_expire_date.replace(/-/g, '/');
+ $scope.partner.certificat_expire_date_d = new Date(datestr);
+ }
+ }
+ $scope.checkExpriedate=function (value) {
+ if(value){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_NA=false;
+ }
+ }
+ $scope.checkExpriedateOther=function (value) {
+ if(value=='PERMANENT'){
+ if($scope.partner.certificat_expire_date_premanent){
+ $scope.partner.certificat_expire_date_NA=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }else if(value=='N/A'){
+ if($scope.partner.certificat_expire_date_NA){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }
}
if($scope.partner.mc_code ){
$scope.partner.mc_code=parseInt($scope.partner.mc_code);
@@ -664,7 +724,23 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
});
return;
}
-
+ if (!$scope.partner.business_structure||$scope.partner.business_structure == '') {
+ alert('Please select the business structure');
+ return;
+ }
+ if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
+ if ($scope.partner.certificat_expire_date_d) {
+ $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
+ } else if ($scope.partner.certificat_expire_date_premanent) {
+ $scope.partner.certificat_expire_date = "PERMANENT";
+ }
+ else if ($scope.partner.certificat_expire_date_NA) {
+ $scope.partner.certificat_expire_date = "N/A";
+ } else {
+ alert("Certificate expiration time is required");
+ return;
+ }
+ }
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
@@ -705,6 +781,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}
+
var content = '';
if (!origin_referrer_id && $scope.partner.referrer_id) {
content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!';
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 8ee03bc88..9bbb7e858 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -152,6 +152,126 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
{
"label": "Medical Service",
"value": "533"
+ },
+ {
+ "label": "Online games (Top-up)",
+ "value": "644"
+ },
+ {
+ "label": "Online Shopping Mall",
+ "value": "648"
+ },
+ {
+ "label": "Supermarket",
+ "value": "649"
+ },
+ {
+ "label": "Convenience Store",
+ "value": "651"
+ },
+ {
+ "label": "Duty-free Shop",
+ "value": "652"
+ },
+ {
+ "label": "Pharmacy",
+ "value": "653"
+ },
+ {
+ "label": "Vending Machine",
+ "value": "654"
+ },
+ {
+ "label": "Department Store /Shopping Centre",
+ "value": "655"
+ },
+ {
+ "label": "Food/Beverages",
+ "value": "656"
+ },
+ {
+ "label": "Catering Services",
+ "value": "657"
+ },
+ {
+ "label": "Furniture/Household Products",
+ "value": "658"
+ },
+ {
+ "label": "Home Appliances/Camera Equipment/Office Equipment",
+ "value": "659"
+ },
+ {
+ "label": "Beauty/Personal Care Products",
+ "value": "660"
+ },
+ {
+ "label": "Flowers/Plants/Interior Decorations/Decorations",
+ "value": "661"
+ },
+ {
+ "label": "Nursery Products/Toys",
+ "value": "662"
+ },
+ {
+ "label": "Clothing/Shoes/Other Accessories",
+ "value": "663"
+ },
+ {
+ "label": "Sports/Fitness Equipment/Security",
+ "value": "664"
+ },
+ {
+ "label": "Watches/Eyewear/Jewellery",
+ "value": "665"
+ },
+ {
+ "label": "Outdoor Products /Travel Products",
+ "value": "666"
+ },
+ {
+ "label": "Books / Records / Stationery / Musical Instruments",
+ "value": "667"
+ },
+ {
+ "label": "Flight ticket/ticketing agent",
+ "value": "668"
+ },
+ {
+ "label": "Sightseeing Passes",
+ "value": "669"
+ },
+ {
+ "label": "Hotel/Resort",
+ "value": "670"
+ },
+ {
+ "label": "Online Books/Video/Music",
+ "value": "671"
+ },
+ {
+ "label": "Online games (Download)",
+ "value": "672"
+ },
+ {
+ "label": "University Education",
+ "value": "677"
+ },
+ {
+ "label": "Public hospitals/Medical Institutions",
+ "value": "679"
+ },
+ {
+ "label": "Private hospitals/Clinics/Medical institutions",
+ "value": "678"
+ },
+ {
+ "label": "Public transit",
+ "value": "680"
+ },
+ {
+ "label": "Logistics/ Courier Service",
+ "value": "684"
}
];
var removeClientPayDesc = function (items, key) {
@@ -3138,8 +3258,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}]);
app.controller('partnerNewSubPartnerDialogCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone',
- 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap', 'wechatGoodMcc',
- function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap, wechatGoodMcc) {
+ 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap','wechatGoodMcc','$filter',
+ function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap,wechatGoodMcc,$filter) {
if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application;
@@ -3161,7 +3281,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.merchantIsValid = false;
$scope.merchantCodeChecked = false;
$scope.wechatMccIndustries = wechatGoodMcc.configs();
-
+ $scope.checkExpriedate=function (value) {
+ if(value){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_NA=false;
+ }
+ }
+ $scope.checkExpriedateOther=function (value) {
+ if(value=='PERMANENT'){
+ if($scope.partner.certificat_expire_date_premanent){
+ $scope.partner.certificat_expire_date_NA=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }else if(value=='N/A'){
+ if($scope.partner.certificat_expire_date_NA){
+ $scope.partner.certificat_expire_date_premanent=false;
+ $scope.partner.certificat_expire_date_d=null;
+ }
+ }
+ }
var resetClientPayDescByTpey = function (type) {
type = parseInt(type);
if (type == 1) {
@@ -3352,6 +3490,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Please select the business structure');
return;
}
+ if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
+ if ($scope.partner.certificat_expire_date_d) {
+ $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
+ } else if ($scope.partner.certificat_expire_date_premanent) {
+ $scope.partner.certificat_expire_date = "PERMANENT";
+ }
+ else if ($scope.partner.certificat_expire_date_NA) {
+ $scope.partner.certificat_expire_date = "N/A";
+ } else {
+ alert("Certificate expiration time is required");
+ return;
+ }
+ }
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
@@ -5071,7 +5222,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
if ($scope.isAll) {
delete params.client_ids;
}
- $http.get('/sys/partners/' + clientMoniker + '/lists_settlements', { params: params }).then(function (resp) {
+ $http.get('/sys/partners/' + clientMoniker + '/lists_settlements', {params: params}).then(function (resp) {
$scope.settlementLogs = resp.data.data;
$scope.padding = resp.data.padding;
$scope.pagination = resp.data.pagination;
@@ -5754,8 +5905,38 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/');
$scope.subMerchantInfo.certificat_expire_date = new Date(datestr);
}
- if ($scope.subMerchantInfo.business_structure) {
- $scope.subMerchantInfo.merchant_type = $scope.subMerchantInfo.business_structure == 'Company' ? "ENTERPRISE" : "INDIVIDUAL";
+ if($scope.subMerchantInfo.business_structure ){
+ $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL";
+ }
+ if(subMerchantInfo.certificat_expire_date) {
+ if(subMerchantInfo.certificat_expire_date=="PERMANENT"){
+ $scope.subMerchantInfo.certificat_expire_date_premanent=true;
+ }else if(subMerchantInfo.certificat_expire_date=="N/A"){
+ $scope.subMerchantInfo.certificat_expire_date_NA=true;
+ }else {
+ var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/');
+ $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr);
+ }
+ }
+
+ $scope.checkExpriedate=function (value) {
+ if(value){
+ $scope.subMerchantInfo.certificat_expire_date_premanent=false;
+ $scope.subMerchantInfo.certificat_expire_date_NA=false;
+ }
+ }
+ $scope.checkExpriedateOther=function (value) {
+ if(value=='PERMANENT'){
+ if($scope.subMerchantInfo.certificat_expire_date_premanent){
+ $scope.subMerchantInfo.certificat_expire_date_NA=false;
+ $scope.subMerchantInfo.certificat_expire_date_d=null;
+ }
+ }else if(value=='N/A'){
+ if($scope.subMerchantInfo.certificat_expire_date_NA){
+ $scope.subMerchantInfo.certificat_expire_date_premanent=false;
+ $scope.subMerchantInfo.certificat_expire_date_d=null;
+ }
+ }
}
$scope.saveAppliy = function (form) {
$scope.errmsg = null;
@@ -5769,37 +5950,46 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
// var merchant_type = $scope.subMerchantInfo.business_structure == 'Company'? 1:2;
var params = {
- company_name: $scope.subMerchantInfo.company_name,
- merchant_id: $scope.subMerchantInfo.merchant_id,
- short_name: $scope.subMerchantInfo.short_name,
- office_phone: $scope.subMerchantInfo.office_phone,
- contact_person: $scope.subMerchantInfo.contact_person,
- contact_phone: $scope.subMerchantInfo.contact_phone,
- company_phone: $scope.subMerchantInfo.company_phone,
- contact_email: $scope.subMerchantInfo.contact_email,
- industry: $scope.subMerchantInfo.industry,
- company_website: $scope.subMerchantInfo.company_website,
+ company_name : $scope.subMerchantInfo.company_name,
+ merchant_id : $scope.subMerchantInfo.merchant_id,
+ short_name : $scope.subMerchantInfo.short_name,
+ office_phone : $scope.subMerchantInfo.office_phone,
+ contact_person : $scope.subMerchantInfo.contact_person,
+ contact_phone : $scope.subMerchantInfo.contact_phone,
+ company_phone : $scope.subMerchantInfo.company_phone,
+ contact_email : $scope.subMerchantInfo.contact_email,
+ industry : $scope.subMerchantInfo.industry,
+ company_website : $scope.subMerchantInfo.company_website,
merchant_type: $scope.subMerchantInfo.merchant_type,
- mcc_code: $scope.subMerchantInfo.mcc_code,
+ mcc_code : $scope.subMerchantInfo.mcc_code,
address: $scope.subMerchantInfo.address,
- business_type: $scope.subMerchantInfo.business_type
+ business_type:$scope.subMerchantInfo.business_type
};
- if (params.business_type == 'ONLINE') {
- params.address = null;
+ if(params.business_type=='ONLINE'){
+ params.address=null;
}
- else if (params.business_type == 'OFFLINE') {
- params.company_website = null;
+ else if(params.business_type=='OFFLINE'){
+ params.company_website=null;
}
- if (params.merchant_type == 'ENTERPRISE') {
+ if(params.merchant_type == 'ENTERPRISE'){
params.director_name = $scope.subMerchantInfo.director_name;
params.director_id_number = $scope.subMerchantInfo.director_id_number;
params.company_register_no = $scope.subMerchantInfo.company_register_no;
params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date;
- if ($scope.subMerchantInfo.certificat_expire_date) {
- params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date)
+
+ if($scope.subMerchantInfo.certificat_expire_date_d) {
+ params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d)
+ }else if($scope.subMerchantInfo.certificat_expire_date_premanent){
+ params.certificat_expire_date="PERMANENT";
}
- } else {
+ else if($scope.subMerchantInfo.certificat_expire_date_NA){
+ params.certificat_expire_date="N/A";
+ }else{
+ alert("Certificate expiration time is required");
+ return;
+ }
+ }else{
params.principal_name = $scope.subMerchantInfo.principal_name;
params.principal_id_number = $scope.subMerchantInfo.principal_id_number;
}
@@ -5808,8 +5998,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.apply_sub_merchant_id = resp.data;
$scope.$close();
if (subMerchantInfo.sub_merchant_id != null) {
- commonDialog.confirm({ title: 'Confirm', content: '已申请成功，是否确认使用' }).then(function () {
- $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then(function (resp) {
+ commonDialog.confirm({title: 'Confirm', content: '已申请成功，是否确认使用'}).then(function () {
+ $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Wechat Sub Merchant ID successfully',
@@ -5817,11 +6007,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
});
$state.reload();
}, function (resp) {
- commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
});
})
} else {
- $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then(function (resp) {
+ $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Apply Success And Modify Wechat Sub Merchant ID successfully',
@@ -5829,35 +6019,35 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
});
$state.reload();
}, function (resp) {
- commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
});
}
}, function (resp) {
- commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
})
}
}]);
- app.controller('updateApplyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', 'wechatGoodMcc', 'merchantInfo', 'businessTypesMap', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, merchantInfo, businessTypesMap) {
+ app.controller('updateApplyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog','wechatGoodMcc','merchantInfo', 'businessTypesMap',function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog,wechatGoodMcc,merchantInfo,businessTypesMap) {
$scope.wxIndustries = angular.copy(wxMerchantIndustries);
$scope.subMerchantInfo = angular.copy(subMerchantInfo.data);
$scope.merchantInfo = angular.copy(merchantInfo);
$scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.merchantIds = merchantIds.data;
- $scope.businessTypesMap = businessTypesMap.configs();
+ $scope.businessTypesMap=businessTypesMap.configs();
- if ($scope.subMerchantInfo.business_structure) {
- $scope.subMerchantInfo.merchant_type = $scope.subMerchantInfo.business_structure == 'Company' ? "ENTERPRISE" : "INDIVIDUAL";
+ if($scope.subMerchantInfo.business_structure ){
+ $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL";
}
- if ($scope.subMerchantInfo.industry) {
+ if($scope.subMerchantInfo.industry) {
$scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry);
}
- if ($scope.subMerchantInfo.mcc_code) {
- $scope.subMerchantInfo.mcc_code = parseInt($scope.subMerchantInfo.mcc_code);
+ if($scope.subMerchantInfo.mcc_code ){
+ $scope.subMerchantInfo.mcc_code=parseInt($scope.subMerchantInfo.mcc_code);
}
- if ($scope.subMerchantInfo.certificat_expire_date) {
+ if($scope.subMerchantInfo.certificat_expire_date) {
// var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/');
- $scope.subMerchantInfo.certificat_expire_date = new Date($scope.subMerchantInfo.certificat_expire_date);
+ $scope.subMerchantInfo.certificat_expire_date=new Date($scope.subMerchantInfo.certificat_expire_date);
}
$scope.updateApply = function (form) {
$scope.errmsg = null;
@@ -5870,44 +6060,44 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
return;
}
var params = {
- company_name: $scope.subMerchantInfo.company_name,
- merchant_id: $scope.subMerchantInfo.merchant_id,
- short_name: $scope.subMerchantInfo.short_name,
- office_phone: $scope.subMerchantInfo.office_phone,
- contact_person: $scope.subMerchantInfo.contact_person,
- contact_phone: $scope.subMerchantInfo.contact_phone,
- company_phone: $scope.subMerchantInfo.company_phone,
- contact_email: $scope.subMerchantInfo.contact_email,
- industry: $scope.subMerchantInfo.industry,
- company_website: $scope.subMerchantInfo.company_website,
+ company_name : $scope.subMerchantInfo.company_name,
+ merchant_id : $scope.subMerchantInfo.merchant_id,
+ short_name : $scope.subMerchantInfo.short_name,
+ office_phone : $scope.subMerchantInfo.office_phone,
+ contact_person : $scope.subMerchantInfo.contact_person,
+ contact_phone : $scope.subMerchantInfo.contact_phone,
+ company_phone : $scope.subMerchantInfo.company_phone,
+ contact_email : $scope.subMerchantInfo.contact_email,
+ industry : $scope.subMerchantInfo.industry,
+ company_website : $scope.subMerchantInfo.company_website,
merchant_type: $scope.subMerchantInfo.merchant_type,
- mcc_code: $scope.subMerchantInfo.mcc_code,
+ mcc_code : $scope.subMerchantInfo.mcc_code,
address: $scope.subMerchantInfo.address,
- business_type: $scope.subMerchantInfo.business_type
+ business_type:$scope.subMerchantInfo.business_type
};
- if (params.business_type == 'ONLINE') {
- params.address = null;
+ if(params.business_type=='ONLINE'){
+ params.address=null;
}
- else if (params.business_type == 'OFFLINE') {
- params.company_website = null;
+ else if(params.business_type=='OFFLINE'){
+ params.company_website=null;
}
- if ($scope.subMerchantInfo.merchant_type == 'ENTERPRISE') {
+ if($scope.subMerchantInfo.merchant_type == 'ENTERPRISE'){
params.director_name = $scope.subMerchantInfo.director_name;
params.director_id_number = $scope.subMerchantInfo.director_id_number;
params.company_register_no = $scope.subMerchantInfo.company_register_no;
params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date;
- if ($scope.subMerchantInfo.certificat_expire_date) {
- params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date)
+ if($scope.subMerchantInfo.certificat_expire_date) {
+ params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date)
}
- } else {
+ }else{
params.principal_name = $scope.subMerchantInfo.principal_name;
params.principal_id_number = $scope.subMerchantInfo.principal_id_number;
}
- $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then(function (resp) {
+ $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/'+$scope.subMerchantInfo.merchant_app_id, params).then(function (resp) {
$scope.apply_sub_merchant_id = resp.data;
$scope.$close();
- commonDialog.confirm({ title: 'Confirm', content: '微信商户进件已修改成功！' })
+ commonDialog.confirm({title: 'Confirm', content: '微信商户进件已修改成功！'})
});
}
}]);
@@ -6951,7 +7141,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
});
- app.filter('wechatMcc', ['wechatGoodMcc', function (wechatGoodMcc) {
+ app.filter('wechatMcc',['wechatGoodMcc', function (wechatGoodMcc) {
return function (values) {
var industry = '';
angular.forEach(wechatGoodMcc.configs(), function (wxMerchant) {
@@ -6996,22 +7186,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
return value + (tail || ' …');
};
});
- app.filter('dateConversionStr', function () {
+ app.filter('dateConversionStr',function () {
- return function (date) {
- var year = date.getFullYear(); //获取完整的年份(4位,1970-????)
- var month = date.getMonth() + 1; //获取当前月份(0-11,0代表1月)
- var day = date.getDate(); //获取当前日(1-31)
- if (month < 10) {
- month = "0" + month;
- }
- if (day < 10) {
- day = "0" + day;
- }
- var dateString = year + "-" + month + "-" + day;
- return dateString;
- };
- }
+ return function (date) {
+ var year = date.getFullYear(); //获取完整的年份(4位,1970-????)
+ var month =date.getMonth() + 1; //获取当前月份(0-11,0代表1月)
+ var day = date.getDate(); //获取当前日(1-31)
+ if (month < 10) {
+ month = "0" + month;
+ }
+ if (day < 10) {
+ day = "0" + day;
+ }
+ var dateString = year + "-" + month + "-" + day;
+ return dateString;
+ };
+ }
);
return app;
});
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 1e4a08256..95308a108 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -309,25 +309,28 @@
-
-
diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
index 9b8971dbe..71120fbf9 100644
--- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
@@ -228,18 +228,25 @@
ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
-
-
-
Required Field
-
Length is more than 50
-
+
+
+
+ PERMANENT
+
+
+
+
+ N/A
+
+