Commit f8795888 by 朱继来

1. 发送邮件参数;

2. 权限调整;
parent 0b4e495b
...@@ -2149,6 +2149,9 @@ Class OrderController extends Controller ...@@ -2149,6 +2149,9 @@ Class OrderController extends Controller
$CmsModel = new CmsModel(); $CmsModel = new CmsModel();
$data['id'] = $CmsModel->getUserName($info['order_info']['sale_id']); //获取业务员 $data['id'] = $CmsModel->getUserName($info['order_info']['sale_id']); //获取业务员
$data['order_id'] = intval($id);
$data['operator_id'] = intval($request->user->userId);
$data['operator_event'] = '发送邮件成功,收件人邮箱:'.json_encode($send_mail_array).',抄送人邮箱:'.json_encode($data['ccUser']);
// 推入到邮件队列 // 推入到邮件队列
$QueuedModel = new QueuedModel(); $QueuedModel = new QueuedModel();
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
$role = DB::table('t_role_perm')->where(['bid' => $bid, 'name' => $roleName])->first(); $role = DB::table('t_role_perm')->where(['bid' => $bid, 'name' => $roleName])->first();
$roleId = $role->roleId; $roleId = isset($role->roleId) ? $role->roleId : 0;
// $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` REGEXP $roleId"); // $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` REGEXP $roleId");
$user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`"); $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`");
......
...@@ -5,7 +5,7 @@ return [ ...@@ -5,7 +5,7 @@ return [
'管理员' => 1, '管理员' => 1,
'经理' => 2, '经理' => 2,
'交易员' => 3, '交易员' => 3,
'客服' => 4, // '客服' => 4,
'测试' => 5, '测试' => 5,
'京东自营' => 6, '京东自营' => 6,
'自营客服' => 7, '自营客服' => 7,
...@@ -35,7 +35,7 @@ return [ ...@@ -35,7 +35,7 @@ return [
], ],
// 筛选自己的订单 // 筛选自己的订单
'kefu_order' => [3, 4, 7, 12, 15, 17, 19], 'kefu_order' => [3, 7, 12, 15, 17, 19],
// 主管角色,查看自己及其组员订单 // 主管角色,查看自己及其组员订单
'manager_order' => [14, 16, 18, 22], 'manager_order' => [14, 16, 18, 22],
...@@ -47,10 +47,10 @@ return [ ...@@ -47,10 +47,10 @@ return [
'is_manager_perm' => [1, 2, 10, 11, 14, 16, 18, 22], 'is_manager_perm' => [1, 2, 10, 11, 14, 16, 18, 22],
// 筛选业务员 -- 联营列表 // 筛选业务员 -- 联营列表
'search_joint_sales' => [3, 4, 5, 14, 15, 16, 17, 18, 19, 22], 'search_joint_sales' => [3, 5, 14, 15, 16, 17, 18, 19, 22],
// 筛选业务员 -- 自营列表 (包含联营、自营客服、交易员、主管) // 筛选业务员 -- 自营列表 (包含联营、自营客服、交易员、主管)
'search_self_sales' => [3, 4, 5, 7, 10, 11, 12, 14, 15, 16, 17, 18, 19, 22], 'search_self_sales' => [3, 5, 7, 10, 11, 12, 14, 15, 16, 17, 18, 19, 22],
// 缓存筛选业务员 // 缓存筛选业务员
'redis_search_sales' => [ 'redis_search_sales' => [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment