This commit is contained in:
parent
422ad40cde
commit
034eb70046
|
@ -956,7 +956,7 @@ class Order extends CI_Controller
|
||||||
$where = " 1 ";
|
$where = " 1 ";
|
||||||
|
|
||||||
//处理数组
|
//处理数组
|
||||||
if ($searchPlaceType) {
|
if ($searchPlaceType && !in_array(-1,$searchPlaceType)) {
|
||||||
$tstr = "0";
|
$tstr = "0";
|
||||||
foreach ($searchPlaceType as $k => $v) {
|
foreach ($searchPlaceType as $k => $v) {
|
||||||
$tstr .= "," . intval($v);
|
$tstr .= "," . intval($v);
|
||||||
|
@ -1013,10 +1013,6 @@ class Order extends CI_Controller
|
||||||
$dataName = 'orderList';
|
$dataName = 'orderList';
|
||||||
$paramFilter = array();
|
$paramFilter = array();
|
||||||
$rowData = $this->lw_pagination2->lists($sql, $param, $page, $hasWhere, $group, $order, $action, $dataName, $paramFilter);
|
$rowData = $this->lw_pagination2->lists($sql, $param, $page, $hasWhere, $group, $order, $action, $dataName, $paramFilter);
|
||||||
// echo "<pre>";
|
|
||||||
// print_r($rowData);
|
|
||||||
// echo "</pre>";
|
|
||||||
// exit();
|
|
||||||
|
|
||||||
$data = $rowData;
|
$data = $rowData;
|
||||||
// 获取菜品名称并且拼接
|
// 获取菜品名称并且拼接
|
||||||
|
@ -1074,7 +1070,7 @@ class Order extends CI_Controller
|
||||||
$where = " 1 ";
|
$where = " 1 ";
|
||||||
|
|
||||||
//处理数组
|
//处理数组
|
||||||
if ($searchPlaceType) {
|
if ($searchPlaceType && !in_array(-1,$searchPlaceType)) {
|
||||||
$tstr = "0";
|
$tstr = "0";
|
||||||
foreach ($searchPlaceType as $k => $v) {
|
foreach ($searchPlaceType as $k => $v) {
|
||||||
$tstr .= "," . intval($v);
|
$tstr .= "," . intval($v);
|
||||||
|
@ -1082,7 +1078,7 @@ class Order extends CI_Controller
|
||||||
$where .= " and a.deliver_place_id in (" . $tstr . ")";
|
$where .= " and a.deliver_place_id in (" . $tstr . ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($searchMealType) {
|
if ($searchMealTypee && !in_array(-1,$searchMealTypee)) {
|
||||||
$tstr = "0";
|
$tstr = "0";
|
||||||
foreach ($searchMealType as $k => $v) {
|
foreach ($searchMealType as $k => $v) {
|
||||||
$tstr .= "," . intval($v);
|
$tstr .= "," . intval($v);
|
||||||
|
|
|
@ -203,6 +203,13 @@ class Order_model extends CI_Model
|
||||||
return $this->db->query($sql)->row_array();
|
return $this->db->query($sql)->row_array();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function get_deliver_place($hallId) {
|
||||||
|
$sql = "
|
||||||
|
select a.*,b.name as diningName,b.id as diningId from tb_order_deliver_place a left join tb_dining_hall b on a.dining_hall_id = b.id where b.id in ('{$hallId}')
|
||||||
|
";
|
||||||
|
return $this->db->query($sql)->result_array();
|
||||||
|
}
|
||||||
|
|
||||||
//获取所有包间信息
|
//获取所有包间信息
|
||||||
public function getALLbjData($page)
|
public function getALLbjData($page)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
<?php
|
||||||
|
$dataList = isset($dataList)? $dataList : array();
|
||||||
|
?>
|
||||||
<div class="modal-dialog modal-lg">
|
<div class="modal-dialog modal-lg">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<form id="submitForm">
|
<form id="submitForm">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
$orderStateList = isset($orderStateList)? $orderStateList : array();
|
$deliverPlaceList = isset($deliverPlaceList)? $deliverPlaceList : array();
|
||||||
$orderTypeList = isset($orderTypeList) ? $orderTypeList :array();
|
$mealList = isset($mealList) ? $mealList :array();
|
||||||
?>
|
?>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
$orderList = isset($orderList)? $orderList : array();
|
$orderList = isset($orderList)? $orderList : array();
|
||||||
$dishList = isset($dishList)? $dishList : array();
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
Loading…
Reference in New Issue