Skip to content

Z
zptz-sass-kelaidian
提交 aa77fbbe authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

edit

上级 eba9d2e5
隐藏空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 41 行删除
app/Http/Middleware/WebLogin.php
浏览文件 @ aa77fbbe
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Models\Admin;
use Closure; use Closure;
use DB; use DB;
use Illuminate\Support\Facades\Crypt; use Illuminate\Support\Facades\Crypt;
...@@ -63,6 +64,10 @@ class WebLogin ...@@ -63,6 +64,10 @@ class WebLogin
$session['install_id'] = $login_web['install_id'];//操作人id $session['install_id'] = $login_web['install_id'];//操作人id
$session['admin_id'] = $login_web['admin_id'];//所属服务商id $session['admin_id'] = $login_web['admin_id'];//所属服务商id
$session['install_name'] = $login_web['install_name'];//操作人信息 $session['install_name'] = $login_web['install_name'];//操作人信息
if($login_web['user_type']==3){
$admin_id = Admin::where('company_id',$login_web['company_id'])->where('admin_groupnew',3)->value('id');
$session['admin_id'] = $admin_id;//所属服务商id
}
$request['session'] = $session; $request['session'] = $session;
return $next($request); return $next($request);
} }
......
app/Services/Api/MobileWeb/AftersaleOrderService.php
浏览文件 @ aa77fbbe
...@@ -45,7 +45,14 @@ class AftersaleOrderService extends Model ...@@ -45,7 +45,14 @@ class AftersaleOrderService extends Model
$session = $request['session']; $session = $request['session'];
// 查询列表 // 查询列表
$list_data = DB::table('order_after as o'); $list_data = DB::table('order_after as o');
$where['ser_id'] =$session['admin_id'];//服务商id if($session['user_type']==3){
$where['agency_id'] =$session['company_id'];//服务商id
if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
$where['ser_id'] = $session['admin_id'];//服务商id
}
}else {
$where['ser_id'] = $session['admin_id'];//服务商id
}
if (!empty($session['install_id']) && $session['user_type'] == 1) { if (!empty($session['install_id']) && $session['user_type'] == 1) {
$where['intall_id'] =$session['install_id'];//技师id $where['intall_id'] =$session['install_id'];//技师id
} }
...@@ -97,11 +104,15 @@ class AftersaleOrderService extends Model ...@@ -97,11 +104,15 @@ class AftersaleOrderService extends Model
$list_items[$key]['first_name'] = $mb_first; $list_items[$key]['first_name'] = $mb_first;
$list_items[$key]['day_time'] = empty($value['day_time']) ? '--':$value['day_time']; $list_items[$key]['day_time'] = empty($value['day_time']) ? '--':$value['day_time'];
$list_items[$key]['button'] = []; $list_items[$key]['button'] = [];
if(in_array($value['status'],[1])){ if($session['user_type']==3 && $value['ser_id']){
$list_items[$key]['button'] = [['action'=>'handle_ive','name'=>'立即处理']];
} }else {
if(in_array($value['status'],[10])){ if (in_array($value['status'], [1])) {
$list_items[$key]['button'] = [['action'=>'quality','name'=>'申请完成'],['action'=>'dailyFeedback','name'=>'日常反馈']]; $list_items[$key]['button'] = [['action' => 'handle_ive', 'name' => '立即处理']];
}
if (in_array($value['status'], [10])) {
$list_items[$key]['button'] = [['action' => 'quality', 'name' => '申请完成'], ['action' => 'dailyFeedback', 'name' => '日常反馈']];
}
} }
} }
$page['count'] = $list_data->total(); //总数据个数 $page['count'] = $list_data->total(); //总数据个数
......
app/Services/Api/MobileWeb/LoginService.php
浏览文件 @ aa77fbbe
...@@ -183,13 +183,15 @@ class LoginService ...@@ -183,13 +183,15 @@ class LoginService
->where('ser_id',$find_person['id']) ->where('ser_id',$find_person['id'])
->where('type',$type) ->where('type',$type)
->value('id'); ->value('id');
if(!$master){ if(!$master && isset($request['push_type']) && $request['push_type'] ==1){
$poss['wechat_number'] = $request['openid']; $poss['wechat_number'] = $request['openid'];
$poss['ser_id']=$find_person['id']; $poss['ser_id']=$find_person['id'];
$poss['creact_time']=date("Y-m-d H:i:s"); $poss['creact_time']=date("Y-m-d H:i:s");
$poss['company_id']=$find_person['company_id']; $poss['company_id']=$find_person['company_id'];
$poss['type']=$type; $poss['type']=$type;
DB::table('ser_master')->insert($poss); DB::table('ser_master')->insert($poss);
}elseif (isset($request['push_type']) && $request['push_type'] ==2 && $master){
DB::table('ser_master')->where('id',$master)->update(['is_delet'=>2]);
} }
// 查询数据表openID是否存在绑定，存在绑定改为离线 // 查询数据表openID是否存在绑定，存在绑定改为离线
DB::table('installation_master') DB::table('installation_master')
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ aa77fbbe
...@@ -38,7 +38,14 @@ class OrderListService extends Model ...@@ -38,7 +38,14 @@ class OrderListService extends Model
// 查询列表 // 查询列表
$list_data = DB::table('order_list as ol') $list_data = DB::table('order_list as ol')
->leftJoin('user as u', 'ol.customer_id', '=', 'u.id'); ->leftJoin('user as u', 'ol.customer_id', '=', 'u.id');
$where['ser_id'] =$session['admin_id'];//服务商id if($session['user_type']==3){
$where['agency_id'] =$session['company_id'];//服务商id
if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
$where['ser_id'] = $session['admin_id'];//服务商id
}
}else {
$where['ser_id'] = $session['admin_id'];//服务商id
}
$where['is_delete'] =1;//是否删除:1正常2删除 $where['is_delete'] =1;//是否删除:1正常2删除
if (!empty($session['install_id']) && $session['user_type'] == 1) { if (!empty($session['install_id']) && $session['user_type'] == 1) {
$where['install_id'] =$session['install_id'];//技师id $where['install_id'] =$session['install_id'];//技师id
...@@ -128,41 +135,50 @@ class OrderListService extends Model ...@@ -128,41 +135,50 @@ class OrderListService extends Model
$list_items[$key]['button'] = []; $list_items[$key]['button'] = [];
if($value['locklist_type'] != 2){ if($value['locklist_type'] != 2){
if(in_array($value['stauas'],[10,20])){ if(in_array($value['stauas'],[10,20])){
if($session['user_type']!=1) { if($session['user_type']==3 && $value['ser_id']!=$session['admin_id']){
$list_items[$key]['button'] = [['action' => 'receiving', 'name' => '接单'], ['action' => 'refuse', 'name' => '拒单']];
}else {
if ($session['user_type'] != 1) {
$list_items[$key]['button'] = [['action' => 'receiving', 'name' => '接单'], ['action' => 'refuse', 'name' => '拒单']];
}
} }
}elseif($value['stauas'] == 30){ }elseif($value['stauas'] == 30){
if($request['stauas']==2){ if($session['user_type']==3 && $value['ser_id']!=$session['admin_id']){
if($session['user_type']!=1) { $list_items[$key]['button'][] = ['action'=>'copyInfo','name'=>'复制信息'];
$list_items[$key]['button'][] = ['action' => 'transferOfOrder', 'name' => '改派']; }else {
if ($request['stauas'] == 2) {
if ($session['user_type'] != 1) {
$list_items[$key]['button'][] = ['action' => 'transferOfOrder', 'name' => '改派'];
}
} }
}if($request['stauas']==3){ if ($request['stauas'] == 3) {
$list_items[$key]['line_state'] = 1; $list_items[$key]['line_state'] = 1;
if(isset($installLine[$value['serial_number']]['line_state'])){ if (isset($installLine[$value['serial_number']]['line_state'])) {
$list_items[$key]['line_state'] = $installLine[$value['serial_number']]['line_state']; $list_items[$key]['line_state'] = $installLine[$value['serial_number']]['line_state'];
switch ( $installLine[$value['serial_number']]['line_state'] ){ switch ($installLine[$value['serial_number']]['line_state']) {
case 2: case 2:
$list_items[$key]['button'][] = ['action'=>'lineStart','name'=>'出发']; $list_items[$key]['button'][] = ['action' => 'lineStart', 'name' => '出发'];
break; break;
case 3: case 3:
$list_items[$key]['button'][] = ['action'=>'lineArrive','name'=>'抵达']; $list_items[$key]['button'][] = ['action' => 'lineArrive', 'name' => '抵达'];
break; break;
case 4: case 4:
$list_items[$key]['button'][] = ['action'=>'startInstall','name'=>'开始安装']; $list_items[$key]['button'][] = ['action' => 'startInstall', 'name' => '开始安装'];
break; break;
case 5: case 5:
$list_items[$key]['button'][] = ['action'=>'installFeedback','name'=>'申请完成']; $list_items[$key]['button'][] = ['action' => 'installFeedback', 'name' => '申请完成'];
break; break;
default: default:
; ;
break; break;
}
$list_items[$key]['button'][] = ['action' => 'contact', 'name' => '修改预约'];
} else {
$list_items[$key]['button'][] = ['action' => 'contact', 'name' => '预约时间'];
} }
$list_items[$key]['button'][] = ['action'=>'contact','name'=>'修改预约'];
}else{
$list_items[$key]['button'][] = ['action'=>'contact','name'=>'预约时间'];
} }
$list_items[$key]['button'][] = ['action'=>'copyInfo','name'=>'复制信息'];
} }
$list_items[$key]['button'][] = ['action'=>'copyInfo','name'=>'复制信息'];
}elseif($value['stauas'] == 34 || $value['stauas'] == 40){ }elseif($value['stauas'] == 34 || $value['stauas'] == 40){
$list_items[$key]['button'] = [['action'=>'copyInfo','name'=>'复制信息']]; $list_items[$key]['button'] = [['action'=>'copyInfo','name'=>'复制信息']];
} }
......
app/Services/Api/MobileWeb/StatementsListService.php
浏览文件 @ aa77fbbe
...@@ -46,9 +46,16 @@ class StatementsListService extends Model ...@@ -46,9 +46,16 @@ class StatementsListService extends Model
if ($request['status'] == 1) {//未出账单 if ($request['status'] == 1) {//未出账单
$list_data = DB::table('settlement_list as s') $list_data = DB::table('settlement_list as s')
->leftJoin('order_list as o', 'o.serial_number', '=', 's.list_id') ->leftJoin('order_list as o', 'o.serial_number', '=', 's.list_id')
->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id') ->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id');
->where('s.ser_id', $session['admin_id']) if($session['user_type']==3){
->where('list_service_type', 40) $list_data = $list_data->where('s.agency_id', $session['company_id']);
if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
$list_data = $list_data->where('s.ser_id', $session['admin_id']);
}
}else {
$list_data = $list_data->where('s.ser_id', $session['admin_id']);
}
$list_data = $list_data->where('list_service_type', 40)
->whereIn('sett_status', [1,60,63]) ->whereIn('sett_status', [1,60,63])
->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state') ->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state')
->paginate($show_count); ->paginate($show_count);
...@@ -166,7 +173,7 @@ class StatementsListService extends Model ...@@ -166,7 +173,7 @@ class StatementsListService extends Model
if ($find_data['stl_type'] !=1){ if ($find_data['stl_type'] !=1){
return ['ErrorCode' => 2, 'ErrorMessage' => '账单状态不正确', 'Data' => '']; return ['ErrorCode' => 2, 'ErrorMessage' => '账单状态不正确', 'Data' => ''];
} }
$info['stl_type'] = 2;//改为处理中 $info['stl_type'] = 2;//改为处理中
$res = DB::table('statements_list') $res = DB::table('statements_list')
->where('stl_id', $request['id']) ->where('stl_id', $request['id'])
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论