|
...
|
...
|
@@ -975,6 +975,8 @@ class Seller extends Common |
|
|
|
|
|
|
|
$rs = Db::query("SELECT
|
|
|
|
dv.type,
|
|
|
|
r.tid,
|
|
|
|
r.tableinfo,
|
|
|
|
r.id,
|
|
|
|
r.rname,
|
|
|
|
r.sex,
|
|
...
|
...
|
@@ -1027,6 +1029,10 @@ class Seller extends Common |
|
|
|
////////////////////////////////
|
|
|
|
|
|
|
|
foreach ($arr['list'] as $key => $value) {
|
|
|
|
//已分配的订单显示 分配的桌位
|
|
|
|
if($value['status']==5){
|
|
|
|
$arr['list'][$key]['tid'] = explode(',',@$value['tid']);
|
|
|
|
}
|
|
|
|
//有无设备
|
|
|
|
if($value['is_tele']==1){
|
|
|
|
switch ($value['type']) {
|
|
...
|
...
|
@@ -1137,7 +1143,23 @@ class Seller extends Common |
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//print_r($arr['list']);die;
|
|
|
|
foreach ($arr['list'] as $key => $value) {
|
|
|
|
$arr['list'][$key]['tablename'] = '';
|
|
|
|
//如果存了桌子的信息则,直接返回桌子信息,否则去桌位表查
|
|
|
|
if($value['tableinfo']!=NULL){
|
|
|
|
$tableArr = json_decode($value['tableinfo'],true);
|
|
|
|
if(is_array($tableArr)){
|
|
|
|
foreach ($tableArr as $tkey => $tvalue) {
|
|
|
|
$arr['list'][$key]['tablename'] .= $tvalue['name'].'、';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/**else{
|
|
|
|
foreach ($value['tid'] as $k => $v) {
|
|
|
|
//$rs[$key]['name'][] = Db::query("SELECT name FROM `xt-member-two-LINE`.xt_dc_seller_table where id = ".$v);
|
|
|
|
}
|
|
|
|
}**/
|
|
|
|
}
|
|
|
|
return $result = [
|
|
|
|
'code'=>0,'msg'=>'获取成功!',
|
|
|
|
'data'=>$arr['list'],
|
|
...
|
...
|
@@ -1186,6 +1208,47 @@ class Seller extends Common |
|
|
|
$rs[$key]['cdate'] = date("Y年m月d日 H时i分",$value['cdate']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//订单详情
|
|
|
|
$detail = Db::query("SELECT
|
|
|
|
r.*,
|
|
|
|
s.sellername
|
|
|
|
FROM
|
|
|
|
`xt-member-two-LINE`.xt_dc_reserve AS r
|
|
|
|
LEFT JOIN `xt-member-two-LINE`.xt_seller AS s ON r.sid = s.id
|
|
|
|
WHERE
|
|
|
|
r.id = ".$data['rid']);
|
|
|
|
switch ($detail[0]['channel']) {
|
|
|
|
case 1:
|
|
|
|
$detail[0]['channel'] = '微信小程序';
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
$detail[0]['channel'] = '电话机';
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
$detail[0]['channel'] = '安卓手机客户端';
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
$detail[0]['channel'] = 'C端';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
# code...
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch ($detail[0]['sex']) {
|
|
|
|
case 1:
|
|
|
|
$detail[0]['sex'] = '先生';
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
$detail[0]['sex'] = '女士';
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
$detail[0]['sex'] = '公司';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
# code...
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
$this->assign ( 'html',$detail[0]);
|
|
|
|
$this->assign ( 'rid',$data['rid']);
|
|
|
|
$this->assign ( 'data',$rs);
|
|
|
|
$this->assign ( 'title','订单操作日志详情');
|
...
|
...
|
|