|
@@ -975,6 +975,8 @@ class Seller extends Common |
|
@@ -975,6 +975,8 @@ class Seller extends Common |
|
975
|
|
975
|
|
|
976
|
$rs = Db::query("SELECT
|
976
|
$rs = Db::query("SELECT
|
|
977
|
dv.type,
|
977
|
dv.type,
|
|
|
|
978
|
+ r.tid,
|
|
|
|
979
|
+ r.tableinfo,
|
|
978
|
r.id,
|
980
|
r.id,
|
|
979
|
r.rname,
|
981
|
r.rname,
|
|
980
|
r.sex,
|
982
|
r.sex,
|
|
@@ -1027,6 +1029,10 @@ class Seller extends Common |
|
@@ -1027,6 +1029,10 @@ class Seller extends Common |
|
1027
|
////////////////////////////////
|
1029
|
////////////////////////////////
|
|
1028
|
|
1030
|
|
|
1029
|
foreach ($arr['list'] as $key => $value) {
|
1031
|
foreach ($arr['list'] as $key => $value) {
|
|
|
|
1032
|
+ //已分配的订单显示 分配的桌位
|
|
|
|
1033
|
+ if($value['status']==5){
|
|
|
|
1034
|
+ $arr['list'][$key]['tid'] = explode(',',@$value['tid']);
|
|
|
|
1035
|
+ }
|
|
1030
|
//有无设备
|
1036
|
//有无设备
|
|
1031
|
if($value['is_tele']==1){
|
1037
|
if($value['is_tele']==1){
|
|
1032
|
switch ($value['type']) {
|
1038
|
switch ($value['type']) {
|
|
@@ -1137,7 +1143,23 @@ class Seller extends Common |
|
@@ -1137,7 +1143,23 @@ class Seller extends Common |
|
1137
|
}
|
1143
|
}
|
|
1138
|
}
|
1144
|
}
|
|
1139
|
}
|
1145
|
}
|
|
1140
|
- //print_r($arr['list']);die;
|
1146
|
+ foreach ($arr['list'] as $key => $value) {
|
|
|
|
1147
|
+ $arr['list'][$key]['tablename'] = '';
|
|
|
|
1148
|
+ //如果存了桌子的信息则，直接返回桌子信息，否则去桌位表查
|
|
|
|
1149
|
+ if($value['tableinfo']!=NULL){
|
|
|
|
1150
|
+ $tableArr = json_decode($value['tableinfo'],true);
|
|
|
|
1151
|
+ if(is_array($tableArr)){
|
|
|
|
1152
|
+ foreach ($tableArr as $tkey => $tvalue) {
|
|
|
|
1153
|
+ $arr['list'][$key]['tablename'] .= $tvalue['name'].'、';
|
|
|
|
1154
|
+ }
|
|
|
|
1155
|
+ }
|
|
|
|
1156
|
+ }
|
|
|
|
1157
|
+ /**else{
|
|
|
|
1158
|
+ foreach ($value['tid'] as $k => $v) {
|
|
|
|
1159
|
+ //$rs[$key]['name'][] = Db::query("SELECT name FROM `xt-member-two-LINE`.xt_dc_seller_table where id = ".$v);
|
|
|
|
1160
|
+ }
|
|
|
|
1161
|
+ }**/
|
|
|
|
1162
|
+ }
|
|
1141
|
return $result = [
|
1163
|
return $result = [
|
|
1142
|
'code'=>0,'msg'=>'获取成功!',
|
1164
|
'code'=>0,'msg'=>'获取成功!',
|
|
1143
|
'data'=>$arr['list'],
|
1165
|
'data'=>$arr['list'],
|
|
@@ -1186,6 +1208,47 @@ class Seller extends Common |
|
@@ -1186,6 +1208,47 @@ class Seller extends Common |
|
1186
|
$rs[$key]['cdate'] = date("Y年m月d日 H时i分",$value['cdate']);
|
1208
|
$rs[$key]['cdate'] = date("Y年m月d日 H时i分",$value['cdate']);
|
|
1187
|
}
|
1209
|
}
|
|
1188
|
}
|
1210
|
}
|
|
|
|
1211
|
+ //订单详情
|
|
|
|
1212
|
+ $detail = Db::query("SELECT
|
|
|
|
1213
|
+ r.*,
|
|
|
|
1214
|
+ s.sellername
|
|
|
|
1215
|
+ FROM
|
|
|
|
1216
|
+ `xt-member-two-LINE`.xt_dc_reserve AS r
|
|
|
|
1217
|
+ LEFT JOIN `xt-member-two-LINE`.xt_seller AS s ON r.sid = s.id
|
|
|
|
1218
|
+ WHERE
|
|
|
|
1219
|
+ r.id = ".$data['rid']);
|
|
|
|
1220
|
+ switch ($detail[0]['channel']) {
|
|
|
|
1221
|
+ case 1:
|
|
|
|
1222
|
+ $detail[0]['channel'] = '微信小程序';
|
|
|
|
1223
|
+ break;
|
|
|
|
1224
|
+ case 2:
|
|
|
|
1225
|
+ $detail[0]['channel'] = '电话机';
|
|
|
|
1226
|
+ break;
|
|
|
|
1227
|
+ case 3:
|
|
|
|
1228
|
+ $detail[0]['channel'] = '安卓手机客户端';
|
|
|
|
1229
|
+ break;
|
|
|
|
1230
|
+ case 4:
|
|
|
|
1231
|
+ $detail[0]['channel'] = 'C端';
|
|
|
|
1232
|
+ break;
|
|
|
|
1233
|
+ default:
|
|
|
|
1234
|
+ # code...
|
|
|
|
1235
|
+ break;
|
|
|
|
1236
|
+ }
|
|
|
|
1237
|
+ switch ($detail[0]['sex']) {
|
|
|
|
1238
|
+ case 1:
|
|
|
|
1239
|
+ $detail[0]['sex'] = '先生';
|
|
|
|
1240
|
+ break;
|
|
|
|
1241
|
+ case 2:
|
|
|
|
1242
|
+ $detail[0]['sex'] = '女士';
|
|
|
|
1243
|
+ break;
|
|
|
|
1244
|
+ case 3:
|
|
|
|
1245
|
+ $detail[0]['sex'] = '公司';
|
|
|
|
1246
|
+ break;
|
|
|
|
1247
|
+ default:
|
|
|
|
1248
|
+ # code...
|
|
|
|
1249
|
+ break;
|
|
|
|
1250
|
+ }
|
|
|
|
1251
|
+ $this->assign ( 'html',$detail[0]);
|
|
1189
|
$this->assign ( 'rid',$data['rid']);
|
1252
|
$this->assign ( 'rid',$data['rid']);
|
|
1190
|
$this->assign ( 'data',$rs);
|
1253
|
$this->assign ( 'data',$rs);
|
|
1191
|
$this->assign ( 'title','订单操作日志详情');
|
1254
|
$this->assign ( 'title','订单操作日志详情');
|
