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

Merge remote-tracking branch 'origin/master'

Browse Source
master
yixian 5 years ago
parent 97d66f1554 df3d19a0dd
commit a18d743ece
3 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File

9
pom.xml
Unescape View File

@ -9,11 +9,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.3.45</version>
<version>2.3.46</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
<docker-image.version>${project.version}</docker-image.version>
</properties>
<dependencies>
@ -266,7 +265,7 @@
<image>192.168.0.84:5000/royalpay/manage-dev</image>
<tags>
<tag>latest</tag>
<tag>${docker-image.version}</tag>
<tag>${project.version}</tag>
</tags>
</to>
<extraDirectories>
@ -301,7 +300,7 @@
<image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
</from>
<to>
<image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${docker-image.version}
<image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${project.version}
</image>
</to>
<extraDirectories>
@ -336,7 +335,7 @@
<image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
</from>
<to>
<image>hkccr.ccs.tencentyun.com/rpay/manage:${docker-image.version}</image>
<image>hkccr.ccs.tencentyun.com/rpay/manage:${project.version}</image>
</to>
<extraDirectories>
<paths>

8
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -1153,8 +1153,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));
if (client.getIntValue("source") == 4 || client.getIntValue("source") == 5) {
List<JSONObject> accounts = clientAccountMapper.listAdminAccounts(client.getIntValue("client_id"));
JSONObject account = accounts.get(0);
sendInitEmail(client, account.getString("username"), "*****", false);
if (accounts == null || accounts.size() <= 0) {
initAdminUserAndSendEmail(manager, clientMoniker, client, false);
} else {
JSONObject account = accounts.get(0);
sendInitEmail(client, account.getString("username"), "*****", false);
}
// sendInitEmail(manager, client, account.getString("username"), "*****");
saveClientAuditProcess(client.getIntValue("client_id"), open_status, 5, "合规通过", manager, 1);
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));

119
src/main/ui/static/boot/managerMainAppv2.js
Unescape View File

@ -6,57 +6,58 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
var app = angular.module('managerMainAppv2', ['ngSanitize', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload']);
app.config(['$urlRouterProvider', '$httpProvider', function ($urlRouterProvider, $httpProvider) {
window.getRoleMenulist = function (role) {
window.getRoleMenulist = function (role) {
var roleMenu = [];
if ((role & 1) >0){
roleMenu.push({'value':'administrator','module':'系统配置'});
if ((role & 1) > 0) {
roleMenu.push({'value': 'administrator', 'module': '系统配置'});
}
if ((role & 2) >0){
roleMenu.push({'value':'compliance','module':'合规中心'});
if ((role & 2) > 0) {
roleMenu.push({'value': 'compliance', 'module': '合规中心'});
}
if ((role & 4) >0){
roleMenu.push({'value':'bduser','module':"销售中心"});
if ((role & 4) > 0) {
roleMenu.push({'value': 'bduser', 'module': "销售中心"});
}
if ((role & 8) >0){
roleMenu.push({'value':'accountant','module':"财务中心"});
if ((role & 8) > 0) {
roleMenu.push({'value': 'accountant', 'module': "财务中心"});
}
if ((role & 64) >0){
roleMenu.push({'value':'director','module':"领导决策"});
if ((role & 64) > 0) {
roleMenu.push({'value': 'director', 'module': "领导决策"});
}
if ((role & 128) >0){
roleMenu.push({'value':'sitemanager','module':"营销中心"});
if ((role & 128) > 0) {
roleMenu.push({'value': 'sitemanager', 'module': "营销中心"});
}
if ((role & 256) >0){
roleMenu.push({'value':'developer','module':"开发中心"});
if ((role & 256) > 0) {
roleMenu.push({'value': 'developer', 'module': "开发中心"});
}
if ((role & 1024) >0){
roleMenu.push({'value':'riskmanager','module':"风控中心"});
if ((role & 1024) > 0) {
roleMenu.push({'value': 'riskmanager', 'module': "风控中心"});
}
if ((role & 2048) >0){
roleMenu.push({'value':'guest','module':"访客中心"});
if ((role & 2048) > 0) {
roleMenu.push({'value': 'guest', 'module': "访客中心"});
}
if ((role & 4096) >0){
roleMenu.push({'value':'orgmanager','module':"代理商中心"});
if ((role & 4096) > 0) {
roleMenu.push({'value': 'orgmanager', 'module': "代理商中心"});
}
if ((role & 8192) >0){
roleMenu.push({'value':'salesmanager','module':"销管中心"});
if ((role & 8192) > 0) {
roleMenu.push({'value': 'salesmanager', 'module': "销管中心"});
}
return roleMenu;
};
if (getRoleMenulist(window.currentUser.role).length>1) {
sessionStorage.setItem('roleNum','N');
if (getRoleMenulist(window.currentUser.role).length > 1) {
sessionStorage.setItem('roleNum', 'N');
$urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
}else {
sessionStorage.setItem('roleNum','1');
sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role)[0].value);
} else {
sessionStorage.setItem('roleNum', '1');
var roleTemplValue = "guest";
if (getRoleMenulist(window.currentUser.role)[0]) {
roleTemplValue = getRoleMenulist(window.currentUser.role)[0].value;
}
sessionStorage.setItem('role', roleTemplValue);
$urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu');
}
if (!$httpProvider.defaults.headers.get) {
$httpProvider.defaults.headers.get = {};
}
@ -64,45 +65,45 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
$httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache';
$httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
}]);
app.controller('managerIndexCtrl', ['$scope', '$state','$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
function ($scope, $state,$rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
app.controller('managerIndexCtrl', ['$scope', '$state', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
function ($scope, $state, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
$scope.rolelist = window.getRoleMenulist(window.currentUser.role);
$scope.roleNow = getroleNow();
$scope.roleName = sessionStorage.getItem('role');
$scope.changeRole = function (index) {
sessionStorage.setItem('role',index);
sessionStorage.setItem('role', index);
$scope.roleNow = getroleNow();
$state.go('listMenu',null,{
reload:true
$state.go('listMenu', null, {
reload: true
});
};
if (sessionStorage.getItem('roleNum') =='N'){
if (window.location.hash == "" || window.location.hash == "#/home") {
$scope.headerDisplay = false;
$scope.copyright = false;
}else {
$scope.headerDisplay = true;
$scope.copyright = true;
}
}else {
if (sessionStorage.getItem('roleNum') == 'N') {
if (window.location.hash == "" || window.location.hash == "#/home") {
$scope.headerDisplay = false;
$scope.copyright = false;
} else {
$scope.headerDisplay = true;
$scope.copyright = true;
}
$scope.headerCopyDisplay = function () {
if (sessionStorage.getItem('role')=='guest'){
} else {
$scope.headerDisplay = true;
$scope.copyright = true;
}
$scope.headerCopyDisplay = function () {
if (sessionStorage.getItem('role') == 'guest') {
return;
}
$state.go('home');
$scope.headerDisplay = false;
$scope.copyright = false;
};
$scope.headerShow = function (role) {
$scope.headerShow = function (role) {
$scope.headerDisplay = true;
$scope.copyright = true;
sessionStorage.setItem('role',role);
sessionStorage.setItem('role', role);
$scope.roleNow = getroleNow();
$scope.roleName = sessionStorage.getItem('role');
};
@ -199,7 +200,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
}
})
};
// $scope.getManagerTodoNotices();
// $scope.getManagerTodoNotices();
var connected;
@ -313,19 +314,19 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
}
$scope.customerService = function () {
$http.put('/sys/openim/check').then(function (resp) {
window.open('/service_client.html?key='+resp.data.appkey+'&p='+resp.data.password+'&uid='+resp.data.user_id,'_blank');
window.open('/service_client.html?key=' + resp.data.appkey + '&p=' + resp.data.password + '&uid=' + resp.data.user_id, '_blank');
});
}
$scope.loadWechatBind = function () {
if (window.currentUser.wx_openid == null) {
/*
if ((window.currentUser.role & 4) > 0) {
$scope.managerBindWechat('static');
} else {
$scope.managerBindWechat(true);
}
*/
/*
if ((window.currentUser.role & 4) > 0) {
$scope.managerBindWechat('static');
} else {
$scope.managerBindWechat(true);
}
*/
$scope.managerBindWechat(true);

Write Preview
Loading…
Cancel
Save