diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js
index d636bc2a7..c410bba37 100644
--- a/src/main/ui/static/config/devtools/devtools.js
+++ b/src/main/ui/static/config/devtools/devtools.js
@@ -51,7 +51,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
url: '/phone_top_up',
templateUrl: '/static/config/devtools/templates/phone_top_up.html',
controller: 'phonetopupCtrl'
- });
+ })
}]);
app.controller('devManualRefundCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
$scope.sendRefund = function () {
@@ -302,5 +302,6 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
})
}
}]);
+
return app;
});
\ No newline at end of file
diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js
index bc1a13938..088b02048 100644
--- a/src/main/ui/static/dashboard/dashboard.js
+++ b/src/main/ui/static/dashboard/dashboard.js
@@ -124,11 +124,23 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
function loadAnalysis() {
$http.get('/dashboard/system/common_analysis_1', {params: $scope.currentScale.params()}).then(function (resp) {
+ // $scope.analysis.new_partners = resp.data.new_partners;
+ // $scope.analysis.total_partners = resp.data.total_partners;
+ // $scope.analysis.traded_partners = resp.data.traded_partners;
+ $scope.analysis.trade_amount = resp.data.trade_amount;
+ $scope.analysis.trade_count = resp.data.trade_count;
+
+ // $scope.analysis.top_amount_order = resp.data.top_amount_order;
+ // $scope.analysis.trade_count = resp.data.trade_count;
+ // $scope.analysis.total_customers = resp.data.total_customers;
+ // $scope.analysis.new_customers = resp.data.total_customers-resp.data.old_customers;
+ // $scope.analysis.old_customers = resp.data.old_customers;
+ });
+
+ $http.get('/dashboard/system/common_analysis_3', {params: $scope.currentScale.params()}).then(function (resp) {
$scope.analysis.new_partners = resp.data.new_partners;
$scope.analysis.total_partners = resp.data.total_partners;
$scope.analysis.traded_partners = resp.data.traded_partners;
- $scope.analysis.trade_amount = resp.data.trade_amount;
- $scope.analysis.trade_count = resp.data.trade_count;
// $scope.analysis.top_amount_order = resp.data.top_amount_order;
// $scope.analysis.trade_count = resp.data.trade_count;
@@ -136,6 +148,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
// $scope.analysis.new_customers = resp.data.total_customers-resp.data.old_customers;
// $scope.analysis.old_customers = resp.data.old_customers;
});
+
$http.get('/dashboard/system/common_analysis_2', {params: $scope.currentScale.params()}).then(function (resp) {
// $scope.analysis.new_partners = resp.data.new_partners;
// $scope.analysis.total_partners = resp.data.total_partners;
diff --git a/src/main/ui/static/payment/merchantid/merchant_id_manager.js b/src/main/ui/static/payment/merchantid/merchant_id_manager.js
new file mode 100644
index 000000000..87dbcbe51
--- /dev/null
+++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js
@@ -0,0 +1,115 @@
+define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiSelect'], function (angular) {
+ 'use strict';
+ var app = angular.module('merchantIdManage', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ui.select']);
+ app.config(['$stateProvider', function ($stateProvider) {
+ $stateProvider.state('merchant_id_manage', {
+ url: '/merchant_id/manage',
+ templateUrl: '/static/payment/merchantid/templates/merchant_id_manage.html',
+ controller: 'merchantIdManageCtrl',
+ data: {label: '商户号列表'}
+ })
+ }]);
+ app.controller('merchantIdManageCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', function ($scope, $state, $http,$uibModal,commonDialog) {
+ $scope.pagination = {};
+ $scope.params = {};
+ $scope.isCollapsed = true;
+
+ $scope.loadClient = function () {
+ $scope.client_loading = true;
+ $http.get('/sys/merchant_id').then(function (resp) {
+ $scope.clientsMap = resp.data;
+ $scope.client_loading = false;
+ });
+ };
+ $scope.loadClient();
+ $scope.loadNotTradeClient = function () {
+ $http.get('/sys/merchant_id/trade').then(function (resp) {
+ $scope.notTradeClientsMap = resp.data.merchant_id_map;
+ $scope.refresh_time = resp.data.refresh_time;
+ $scope.disable_button = false;
+ });
+ };
+ $scope.loadNotTradeClient();
+
+ $scope.loadTempSubMerchantId = function () {
+ var params = angular.copy($scope.params);
+ if(!params.sub_merchant_id){
+ delete params.sub_merchant_id;
+ }
+ $http.get('/sys/merchant_id/common_sub_merchant_id',{params: params}).then(function (resp) {
+ $scope.subMerchantIdList= resp.data;
+ });
+ };
+ $scope.loadTempSubMerchantId();
+ $scope.showClient = function (sub_merchant_id) {
+ $uibModal.open({
+ templateUrl: '/static/payment/merchantid/templates/client_sub_merchant_id.html',
+ controller: 'showClientsCtrl',
+ resolve: {
+ clients: ['$http', function ($http) {
+ return $http.get('/sys/merchant_id/'+sub_merchant_id);
+ }]
+ },
+ size: 'sm'
+ })
+ };
+
+ $scope.refresh = function () {
+ $scope.disable_button = true;
+ $http.post('/sys/merchant_id/refresh').then(function (resp) {
+ $scope.loadNotTradeClient();
+ });
+ };
+
+ $scope.save = function () {
+ $uibModal.open({
+ templateUrl: '/static/payment/merchantid/templates/new_common_sub_merchant_id.html',
+ controller: 'newCommonSubMerchantIdCtrl'
+ }).result.then(function () {
+ $scope.loadTempSubMerchantId()
+ })
+ }
+ $scope.disable = function (sub_merchant_id) {
+ $http.put('/sys/merchant_id/common_sub_merchant_id/'+sub_merchant_id).then(function (resp) {
+ commonDialog.alert({title: 'Success', content: 'Success', type: 'success'});
+ $scope.loadTempSubMerchantId();
+ },function (resp) {
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+ });
+ }
+
+
+ }]);
+
+ app.controller('showClientsCtrl', ['$scope', '$http','clients', function ($scope, $http,clients) {
+ $scope.clients = clients.data;
+ }]);
+ app.controller('newCommonSubMerchantIdCtrl', ['$scope', '$http','commonDialog','$state', function ($scope, $http,commonDialog,$state) {
+ $scope.params = {};
+ $scope.saveSubMerchantId = function () {
+ var params = angular.copy($scope.params);
+ $http.post('/sys/merchant_id/common_sub_merchant_id/'+params.sub_merchant_id).then(function () {
+ $scope.$close();
+ commonDialog.alert({title: 'Success', content: '保存成功', type: 'success'});
+ },function (resp) {
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+ });
+ };
+ }]);
+
+ app.filter('choose_merchant_id', function () {
+ return function (value) {
+ switch (value + '') {
+ case '1307485301':
+ return '1307485301(Tunnel Show1)';
+ case '1431999902':
+ return '1431999902(Tunnel Show2)';
+ case '1487387142':
+ return '1487387142(NAP)';
+ case '':
+ return ''
+ }
+ }
+ });
+ return app;
+});
\ No newline at end of file
diff --git a/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html
new file mode 100644
index 000000000..e2460c5dc
--- /dev/null
+++ b/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html
@@ -0,0 +1,26 @@
+
+
+
diff --git a/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html b/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html
new file mode 100644
index 000000000..0654d3fef
--- /dev/null
+++ b/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上次刷新时间:{{refresh_time}}
+
+
+
+
+
+
+
+
+
+
+
+
+ | Merchant Id |
+ Sub Merchant Id |
+ Operator |
+ Create Time |
+ Operation |
+
+
+
+
+ |
+
+ {{client.sub_merchant_id}}
+
+ |
+ |
+ |
+
+ Disable
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html
new file mode 100644
index 000000000..3e432fffe
--- /dev/null
+++ b/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html
@@ -0,0 +1,24 @@
+
+
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 549a40736..138388d1f 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -385,6 +385,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert("Logo is necessary!");
return;
}
+ if($scope.partner.partner_type == 'photo'){
+ if (!$scope.partner.company_photo) {
+ alert('Shop Photo1 is necessary');
+ return;
+ }
+ if (!$scope.partner.store_photo) {
+ alert('Shop Photo2 is necessary');
+ return;
+ }
+ }
+
if ($scope.partner.referrer_id) {
$scope.referrers.forEach(function (e) {
if ($scope.partner.referrer_id == e.org_id) {
@@ -393,6 +404,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}
+ if(!window.frames['merchant_detail'].merchant_location){
+ alert("Please Locate Merchant's Location");
+ return;
+ }
$http.post('/sys/partners', $scope.partner).then(function (resp) {
commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
$scope.updateMerchantLocation();
@@ -423,18 +438,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) {
if (file != null) {
- $scope.photoProgress = {value: 0};
+ $scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
+ commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
+ }, function (evt) {
+ $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ })
+ }
+ };
+
+ $scope.uploadStorePhoto = function (file) {
+ if (file != null) {
+ $scope.storePhotoProgress = {value: 0};
+ Upload.upload({
+ url: '/attachment/files',
+ data: {file: file}
+ }).then(function (resp) {
+ delete $scope.storePhotoProgress;
+ $scope.partner.store_photo = resp.data.url;
+ }, function (resp) {
+ delete $scope.storePhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
- $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
};
@@ -444,14 +477,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
if (params) {
$http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {
});
- } else {
- alert("Please Locate Merchant's Location");
}
}
}]);
app.controller('partnerDetailCtrl', ['$scope', '$http', '$state', '$uibModal', '$rootScope', 'Upload', 'commonDialog', 'partner', function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner) {
$scope.init = {wechat_compliance: false, local_merchant: false};
$scope.partner = partner.data;
+ var website = partner.data.company_website;
+ if (website!=null){
+ if (website.indexOf('http')!=0){
+ $scope.partner.company_website= 'http://'+angular.copy(website);
+ }
+ }
$scope.showDBUsers = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/bd_user').then(function (resp) {
$scope.partner.client_bds = resp.data;
@@ -895,6 +932,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('suburb can not contain two and more continuous space characters');
return;
}
+ if($scope.partner.partner_type == 'photo'){
+ if (!$scope.partner.company_photo) {
+ alert('Shop Photo1 is necessary');
+ return;
+ }
+ if (!$scope.partner.store_photo) {
+ alert('Shop Photo2 is necessary');
+ return;
+ }
+ }
+
if ($scope.partner.acn && $scope.partner.business_structure == 'Company') {
if ($scope.partner.acn.length != 9) {
alert('Acn is not valid');
@@ -908,11 +956,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}
- $scope.updateMerchantLocation();
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!';
}
+ if(!window.frames['merchant_detail'].merchant_location){
+ alert("Please Locate Merchant Location!");
+ return;
+ }
$http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then(function () {
if (content != '') {
commonDialog.alert({
@@ -927,6 +978,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
type: 'success'
});
}
+ $scope.updateMerchantLocation();
$scope.loadPartners();
$state.go('^.detail', {clientMoniker: $scope.partner.client_moniker}, {reload: true});
}, function (resp) {
@@ -954,18 +1006,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) {
if (file != null) {
- $scope.photoProgress = {value: 0};
+ $scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
- $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ })
+ }
+ };
+
+ $scope.uploadStorePhoto = function (file) {
+ if (file != null) {
+ $scope.storePhotoProgress = {value: 0};
+ Upload.upload({
+ url: '/attachment/files',
+ data: {file: file}
+ }).then(function (resp) {
+ delete $scope.storePhotoProgress;
+ $scope.partner.store_photo = resp.data.url;
+ }, function (resp) {
+ delete $scope.storePhotoProgress;
+ commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
+ }, function (evt) {
+ $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
};
@@ -982,16 +1052,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
if (params) {
$http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {
});
- } else {
- commonDialog.alert({
- title: 'Warning',
- content: 'Please Locate Merchant Location',
- type: 'error'
- });
}
}
}]);
- app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog', function ($scope, $http, $state, commonDialog) {
+ app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', function ($scope, $http, $state, commonDialog,$uibModal) {
$scope.loadPartnerPaymentInfo = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
$scope.paymentInfo = resp.data;
@@ -1010,6 +1074,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.reloadQRCode();
$scope.loadPartnerPaymentInfo();
+ $scope.showSubMerchantLogs = function () {
+ $uibModal.open({
+ templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html',
+ controller: 'clientSubMerchantIdLogCtrl',
+ size: 'lg',
+ resolve: {
+ logs: ['$http', function ($http) {
+ return $http.get('/sys/partners/'+$scope.partner.client_moniker+'/get_sub_merchant_id_logs');
+ }]
+ }
+ }).result.then(function () {
+ $scope.loadSubClients();
+ });
+ };
+
$scope.saveMaxOrderAmount = function (limit) {
if (limit != null && isNaN(limit)) {
commonDialog.alert({title: 'Error', content: 'Your input is not a number!', type: 'error'});
@@ -1123,7 +1202,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
})
})
};
- $scope.init = {jsapi: false, gateway: false, offline: false, refund: false, channel: {}};
+ $scope.init = {jsapi: false, gateway: false, offline: false, refund: false,common_sub_merchant_id:false, channel: {}};
+ $scope.switchCommonSubMerchantId = function () {
+ if (!$scope.paymentInfo) {
+ return;
+ }
+ if (!$scope.init.common_sub_merchant_id) {
+ $scope.init.common_sub_merchant_id = true;
+ return;
+ }
+ $http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', {allow: $scope.paymentInfo.common_sub_merchant_id}).then(function () {
+ $scope.loadPartnerPaymentInfo();
+ }, function (resp) {
+ commonDialog.alert({
+ title: 'Failed to change common_sub_merchant_id permission status',
+ content: resp.data.message,
+ type: 'error'
+ })
+ })
+ };
$scope.toggleChannel = function (channel) {
if (!channel) {
return;
@@ -1308,6 +1405,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
}]);
+ app.controller('clientSubMerchantIdLogCtrl', ['$scope', '$http', 'logs', function ($scope, $http, logs) {
+ $scope.logs = logs.data;
+ }]);
app.controller('partnerSubCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
$scope.newSubClient = function () {
$uibModal.open({
@@ -1395,6 +1495,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
$scope.getRates();
$scope.saveBankAccount = function () {
+ if(isNaN($scope.bankaccount.account_no)){
+ alert("Account No应输入数字!");
+ return;
+ };
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/bank_account', $scope.bankaccount).then(function () {
$scope.getBankAccount();
}, function (resp) {
@@ -1723,6 +1827,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
return;
}
}
+ if (!$scope.partner.logo_url) {
+ alert("Logo is necessary!");
+ return;
+ }
+ if($scope.partner.partner_type == 'photo'){
+ if (!$scope.partner.company_photo) {
+ alert('Shop Photo1 is necessary');
+ return;
+ }
+ if (!$scope.partner.store_photo) {
+ alert('Shop Photo2 is necessary');
+ return;
+ }
+ }
+ if(!window.frames['merchant_detail'].merchant_location){
+ alert("Please Locate Merchant Location!");
+ return;
+ }
$http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then(function () {
$scope.updateMerchantLocation();
$scope.$close();
@@ -1751,18 +1873,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) {
if (file != null) {
- $scope.photoProgress = {value: 0};
+ $scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
- $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ })
+ }
+ };
+
+ $scope.uploadStorePhoto = function (file) {
+ if (file != null) {
+ $scope.storePhotoProgress = {value: 0};
+ Upload.upload({
+ url: '/attachment/files',
+ data: {file: file}
+ }).then(function (resp) {
+ delete $scope.storePhotoProgress;
+ $scope.partner.store_photo = resp.data.url;
+ }, function (resp) {
+ delete $scope.storePhotoProgress;
+ commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
+ }, function (evt) {
+ $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
};
@@ -1771,12 +1911,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
if (params) {
$http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {
});
- } else {
- commonDialog.alert({
- title: 'Warning',
- content: 'Please Locate Merchant Location',
- type: 'error'
- });
}
}
}]);
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 9dbb2a3fd..df9fa4b0f 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -1,3 +1,9 @@
+
Currency